Index: branches/wmf/1.18wmf1/extensions/WikimediaIncubator/IncubatorTest.php |
— | — | @@ -666,7 +666,7 @@ |
667 | 667 | static function fnTestWikiLogo( &$out ) { |
668 | 668 | $setLogo = self::shouldWeSetCustomLogo( $out->getTitle() ); |
669 | 669 | if( !$setLogo ) { |
670 | | - return false; |
| 670 | + return true; |
671 | 671 | } |
672 | 672 | global $wgLogo; |
673 | 673 | $prefixForPageTitle = str_replace( '/', '-', strtolower( $setLogo['prefix'] ) ); |
— | — | @@ -683,7 +683,7 @@ |
684 | 684 | $wgLogo = $thumb->getUrl(); |
685 | 685 | return true; |
686 | 686 | } |
687 | | - return false; |
| 687 | + return true; |
688 | 688 | } |
689 | 689 | # Use MediaWiki:Incubator-logo-wx-xx(x) |
690 | 690 | $thumb = $file->transform( array( 'width' => 135, 'height' => 135 ) ); |
Property changes on: branches/wmf/1.18wmf1/extensions/WikimediaIncubator/IncubatorTest.php |
___________________________________________________________________ |
Added: svn:mergeinfo |
691 | 691 | Merged /branches/new-installer/phase3/extensions/WikimediaIncubator/IncubatorTest.php:r43664-66004 |
692 | 692 | Merged /branches/wmf-deployment/extensions/WikimediaIncubator/IncubatorTest.php:r60970 |
693 | 693 | Merged /branches/REL1_15/phase3/extensions/WikimediaIncubator/IncubatorTest.php:r51646 |
694 | 694 | Merged /branches/wmf/1.16wmf4/extensions/WikimediaIncubator/IncubatorTest.php:r67177,69199,76243,77266 |
695 | 695 | Merged /trunk/extensions/WikimediaIncubator/IncubatorTest.php:r107120 |
696 | 696 | Merged /branches/sqlite/extensions/WikimediaIncubator/IncubatorTest.php:r58211-58321 |
697 | 697 | Merged /trunk/phase3/extensions/WikimediaIncubator/IncubatorTest.php:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590 |