| Index: branches/wmf/1.18wmf1/skins/simple/main.css |
| — | — | @@ -312,9 +312,9 @@ |
| 313 | 313 | text-decoration: line-through; |
| 314 | 314 | } |
| 315 | 315 | /** |
| 316 | | -+ * Overrides text justification (user preference) |
| 317 | | -+ * See bug 31990 |
| 318 | | -+ */ |
| | 316 | + * Overrides text justification (user preference) |
| | 317 | + * See bug 31990 |
| | 318 | + */ |
| 319 | 319 | #catlinks { |
| 320 | 320 | text-align: center; |
| 321 | 321 | } |
| Index: branches/wmf/1.18wmf1/includes/OutputPage.php |
| — | — | @@ -2402,7 +2402,8 @@ |
| 2403 | 2403 | foreach ( (array) $modules as $name ) { |
| 2404 | 2404 | $module = $resourceLoader->getModule( $name ); |
| 2405 | 2405 | # Check that we're allowed to include this module on this page |
| 2406 | | - if ( ( $module->getOrigin() > $this->getAllowedModules( ResourceLoaderModule::TYPE_SCRIPTS ) |
| | 2406 | + if ( !$module |
| | 2407 | + || ( $module->getOrigin() > $this->getAllowedModules( ResourceLoaderModule::TYPE_SCRIPTS ) |
| 2407 | 2408 | && $only == ResourceLoaderModule::TYPE_SCRIPTS ) |
| 2408 | 2409 | || ( $module->getOrigin() > $this->getAllowedModules( ResourceLoaderModule::TYPE_STYLES ) |
| 2409 | 2410 | && $only == ResourceLoaderModule::TYPE_STYLES ) |
| — | — | @@ -2970,7 +2971,11 @@ |
| 2971 | 2972 | $styles = array( 'other' => array(), 'user' => array(), 'site' => array(), 'private' => array(), 'noscript' => array() ); |
| 2972 | 2973 | $resourceLoader = $this->getResourceLoader(); |
| 2973 | 2974 | foreach ( $this->getModuleStyles() as $name ) { |
| 2974 | | - $group = $resourceLoader->getModule( $name )->getGroup(); |
| | 2975 | + $module = $resourceLoader->getModule( $name ); |
| | 2976 | + if ( !$module ) { |
| | 2977 | + continue; |
| | 2978 | + } |
| | 2979 | + $group = $module->getGroup(); |
| 2975 | 2980 | // Modules in groups named "other" or anything different than "user", "site" or "private" |
| 2976 | 2981 | // will be placed in the "other" group |
| 2977 | 2982 | $styles[isset( $styles[$group] ) ? $group : 'other'][] = $name; |
| Property changes on: branches/wmf/1.18wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2978 | 2983 | Merged /trunk/phase3/includes/OutputPage.php:r104030,104033,104146,104671 |
| Index: branches/wmf/1.18wmf1/includes/api/ApiQueryExtLinksUsage.php |
| — | — | @@ -182,7 +182,9 @@ |
| 183 | 183 | global $wgUrlProtocols; |
| 184 | 184 | $protocols = array( '' ); |
| 185 | 185 | foreach ( $wgUrlProtocols as $p ) { |
| 186 | | - $protocols[] = substr( $p, 0, strpos( $p, ':' ) ); |
| | 186 | + if ( $p !== '//' ) { |
| | 187 | + $protocols[] = substr( $p, 0, strpos( $p, ':' ) ); |
| | 188 | + } |
| 187 | 189 | } |
| 188 | 190 | return $protocols; |
| 189 | 191 | } |
| Property changes on: branches/wmf/1.18wmf1/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 190 | 192 | Merged /trunk/phase3/includes/api:r104033,104146,104671 |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialLinkSearch.php |
| — | — | @@ -57,7 +57,9 @@ |
| 58 | 58 | |
| 59 | 59 | $protocols_list = array(); |
| 60 | 60 | foreach( $wgUrlProtocols as $prot ) { |
| 61 | | - $protocols_list[] = $prot; |
| | 61 | + if ( $prot !== '//' ) { |
| | 62 | + $protocols_list[] = $prot; |
| | 63 | + } |
| 62 | 64 | } |
| 63 | 65 | |
| 64 | 66 | $target2 = $target; |
| — | — | @@ -76,13 +78,13 @@ |
| 77 | 79 | // default |
| 78 | 80 | $protocol = 'http://'; |
| 79 | 81 | } |
| 80 | | - if ( !in_array( $protocol, $protocols_list ) ) { |
| | 82 | + if ( $protocol != '' && !in_array( $protocol, $protocols_list ) ) { |
| 81 | 83 | // unsupported protocol, show original search request |
| 82 | 84 | $target2 = $target; |
| 83 | 85 | $protocol = ''; |
| 84 | 86 | } |
| 85 | 87 | |
| 86 | | - $out->addWikiMsg( 'linksearch-text', '<nowiki>' . $this->getLang()->commaList( $wgUrlProtocols ) . '</nowiki>' ); |
| | 88 | + $out->addWikiMsg( 'linksearch-text', '<nowiki>' . $this->getLanguage()->commaList( $protocols_list ) . '</nowiki>' ); |
| 87 | 89 | $s = Xml::openElement( 'form', array( 'id' => 'mw-linksearch-form', 'method' => 'get', 'action' => $GLOBALS['wgScript'] ) ) . |
| 88 | 90 | Html::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) . |
| 89 | 91 | '<fieldset>' . |
| Property changes on: branches/wmf/1.18wmf1/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 90 | 92 | Merged /trunk/phase3/includes/specials:r104033,104146,104671 |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 91 | 93 | Merged /trunk/phase3/includes:r104030,104033,104146,104671 |
| Index: branches/wmf/1.18wmf1/resources/jquery/jquery.collapsibleTabs.js |
| — | — | @@ -24,7 +24,7 @@ |
| 25 | 25 | // if we haven't already bound our resize hanlder, bind it now |
| 26 | 26 | if( !$.collapsibleTabs.boundEvent ) { |
| 27 | 27 | $( window ) |
| 28 | | - .delayedBind( '500', 'resize', function( ) { $.collapsibleTabs.handleResize(); } ); |
| | 28 | + .delayedBind( '500', 'resize', null, function( ) { $.collapsibleTabs.handleResize(); } ); |
| 29 | 29 | } |
| 30 | 30 | // call our resize handler to setup the page |
| 31 | 31 | $.collapsibleTabs.handleResize(); |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 32 | 32 | Merged /trunk/phase3:r104030,104033,104146,104671 |