[mb-commits] branch, mbs-5797, created. MBS-5797: Don't crash on non-Wikipedia Wikipedia relationships

MusicBrainz Git Server <[email protected]> Tue, 29 Jan 2013 13:52:17 +0000
Newsgroups gmane.comp.audio.musicbrainz.cvs
Message-ID <E1U0Bbl-0003E9-47@wiley>
The branch, mbs-5797 has been created
        at  ef47e30ee56acc2944362ea917c2ea2f854d6e4b (commit)

- Log -----------------------------------------------------------------
commit ef47e30ee56acc2944362ea917c2ea2f854d6e4b
Author: Oliver Charles <[email protected]>
Date:   Tue Jan 29 13:56:09 2013 +0000

    MBS-5797: Don't crash on non-Wikipedia Wikipedia relationships
    
    Controller::Role::WikipediaExtract is used to add Wikipedia summaries on an
    entity, based on Wikipedia URL relationships. However, if a Wikipedia URL
    relationship is present, but the URL is not actually to Wikipedia, an exception
    would be thrown.
    
    This commit addresses that by filtering the list of relationships considered to
    only be those relationships that truly do point to Wikipedia.

diff --git a/lib/MusicBrainz/Server/Controller/Role/WikipediaExtract.pm b/lib/MusicBrainz/Server/Controller/Role/WikipediaExtract.pm
index 906ab59..70b157c 100644
--- a/lib/MusicBrainz/Server/Controller/Role/WikipediaExtract.pm
+++ b/lib/MusicBrainz/Server/Controller/Role/WikipediaExtract.pm
@@ -31,6 +31,8 @@ sub _get_extract
             $_->target;
         } reverse sort_by {
             $_->target->language eq $wanted_lang
+        } grep {
+            $_->target->isa('MusicBrainz::Server::Entity::URL::Wikipedia')
         } @{ $entity->relationships_by_link_type_names('wikipedia') };
 
     if ($wp_link) {

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server