| Index: branches/REL1_18/phase3/skins/CologneBlue.php |
| — | — | @@ -29,23 +29,23 @@ |
| 30 | 30 | if ( 2 == $qb ) { # Right |
| 31 | 31 | $rules[] = "/* @noflip */#quickbar { position: absolute; right: 4px; }"; |
| 32 | 32 | $rules[] = "/* @noflip */#article { margin-left: 4px; margin-right: 148px; }"; |
| 33 | | - $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }"; |
| | 33 | + $rules[] = "/* @noflip */#footer { margin-right: 152px; }"; |
| 34 | 34 | } elseif ( 1 == $qb ) { |
| 35 | 35 | $rules[] = "/* @noflip */#quickbar { position: absolute; left: 4px; }"; |
| 36 | 36 | $rules[] = "/* @noflip */#article { margin-left: 148px; margin-right: 4px; }"; |
| 37 | | - $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }"; |
| | 37 | + $rules[] = "/* @noflip */#footer { margin-left: 152px; }"; |
| 38 | 38 | } elseif ( 3 == $qb ) { # Floating left |
| 39 | 39 | $rules[] = "/* @noflip */#quickbar { position:absolute; left:4px }"; |
| 40 | 40 | $rules[] = "/* @noflip */#topbar { margin-left: 148px }"; |
| 41 | 41 | $rules[] = "/* @noflip */#article { margin-left:148px; margin-right: 4px; }"; |
| 42 | 42 | $rules[] = "/* @noflip */body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto; bottom:4px;}"; # Hides from IE |
| 43 | | - $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }"; |
| | 43 | + $rules[] = "/* @noflip */#footer { margin-left: 152px; }"; |
| 44 | 44 | } elseif ( 4 == $qb ) { # Floating right |
| 45 | 45 | $rules[] = "/* @noflip */#quickbar { position: fixed; right: 4px; }"; |
| 46 | 46 | $rules[] = "/* @noflip */#topbar { margin-right: 148px }"; |
| 47 | 47 | $rules[] = "/* @noflip */#article { margin-right: 148px; margin-left: 4px; }"; |
| 48 | 48 | $rules[] = "/* @noflip */body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto; bottom:4px;}"; # Hides from IE |
| 49 | | - $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }"; |
| | 49 | + $rules[] = "/* @noflip */#footer { margin-right: 152px; }"; |
| 50 | 50 | } |
| 51 | 51 | $style = implode( "\n", $rules ); |
| 52 | 52 | $out->addInlineStyle( $style, 'flip' ); |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | |
| 69 | 69 | $s .= '</td><td class="top" id="top-syslinks" width="100%">'; |
| 70 | 70 | $s .= $this->sysLinks(); |
| 71 | | - $s .= '</td></tr><tr><td class="top-linkcollection">'; |
| | 71 | + $s .= '</td></tr><tr><td class="top-subheader">'; |
| 72 | 72 | |
| 73 | 73 | $s .= '<font size="-1"><span id="sitesub">'; |
| 74 | 74 | $s .= htmlspecialchars( wfMsg( 'sitesubtitle' ) ) . '</span></font>'; |
| Index: branches/REL1_18/phase3/skins/cologneblue/screen.css |
| — | — | @@ -103,6 +103,9 @@ |
| 104 | 104 | td.top-linkcollection { |
| 105 | 105 | text-align: right; |
| 106 | 106 | } |
| | 107 | +td.top-subheader { |
| | 108 | + vertical-align: top; |
| | 109 | +} |
| 107 | 110 | |
| 108 | 111 | /** |
| 109 | 112 | * Overrides text justification (user preference) |
| Index: branches/REL1_18/phase3/includes/installer/DatabaseUpdater.php |
| — | — | @@ -190,7 +190,7 @@ |
| 191 | 191 | * @param $what Array: what updates to perform |
| 192 | 192 | */ |
| 193 | 193 | public function doUpdates( $what = array( 'core', 'extensions', 'purge', 'stats' ) ) { |
| 194 | | - global $wgVersion; |
| | 194 | + global $wgLocalisationCacheConf, $wgVersion; |
| 195 | 195 | |
| 196 | 196 | $what = array_flip( $what ); |
| 197 | 197 | if ( isset( $what['core'] ) ) { |
| — | — | @@ -203,8 +203,12 @@ |
| 204 | 204 | |
| 205 | 205 | $this->setAppliedUpdates( $wgVersion, $this->updates ); |
| 206 | 206 | |
| 207 | | - if( isset( $what['purge'] ) ) { |
| | 207 | + if ( isset( $what['purge'] ) ) { |
| 208 | 208 | $this->purgeCache(); |
| | 209 | + |
| | 210 | + if ( $wgLocalisationCacheConf['manualRecache'] ) { |
| | 211 | + $this->rebuildLocalisationCache(); |
| | 212 | + } |
| 209 | 213 | } |
| 210 | 214 | if ( isset( $what['stats'] ) ) { |
| 211 | 215 | $this->checkStats(); |
| — | — | @@ -575,7 +579,7 @@ |
| 576 | 580 | $task->execute(); |
| 577 | 581 | } |
| 578 | 582 | |
| 579 | | - protected function doRebuildLocalisationCache() { |
| | 583 | + protected function rebuildLocalisationCache() { |
| 580 | 584 | /** |
| 581 | 585 | * @var $cl RebuildLocalisationCache |
| 582 | 586 | */ |
| Index: branches/REL1_18/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -182,7 +182,6 @@ |
| 183 | 183 | array( 'modifyField', 'user_properties', 'up_property', 'patch-up_property.sql' ), |
| 184 | 184 | array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ), |
| 185 | 185 | array( 'addTable', 'user_former_groups', 'patch-user_former_groups.sql'), |
| 186 | | - array( 'doRebuildLocalisationCache' ), |
| 187 | 186 | ); |
| 188 | 187 | } |
| 189 | 188 | |
| Index: branches/REL1_18/phase3/includes/installer/OracleUpdater.php |
| — | — | @@ -36,7 +36,6 @@ |
| 37 | 37 | array( 'addIndex', 'user', 'i02', 'patch-user_email_index.sql' ), |
| 38 | 38 | array( 'modifyField', 'user_properties', 'up_property', 'patch-up_property.sql' ), |
| 39 | 39 | array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ), |
| 40 | | - array( 'doRebuildLocalisationCache' ), |
| 41 | 40 | array( 'doRebuildDuplicateFunction' ), |
| 42 | 41 | |
| 43 | 42 | ); |
| Index: branches/REL1_18/phase3/includes/installer/SqliteUpdater.php |
| — | — | @@ -59,7 +59,6 @@ |
| 60 | 60 | array( 'addIndex', 'user', 'user_email', 'patch-user_email_index.sql' ), |
| 61 | 61 | array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ), |
| 62 | 62 | array( 'addTable', 'user_former_groups', 'patch-user_former_groups.sql'), |
| 63 | | - array( 'doRebuildLocalisationCache' ), |
| 64 | 63 | ); |
| 65 | 64 | } |
| 66 | 65 | |
| Index: branches/REL1_18/phase3/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/REL1_18/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 190 | 192 | Merged /trunk/phase3/includes/api:r104033 |
| Index: branches/REL1_18/phase3/includes/specials/SpecialLinkSearch.php |
| — | — | @@ -50,9 +50,11 @@ |
| 51 | 51 | $target = $wgRequest->getVal( 'target', $par ); |
| 52 | 52 | $namespace = $wgRequest->getIntorNull( 'namespace', null ); |
| 53 | 53 | |
| 54 | | - $protocols_list[] = ''; |
| | 54 | + $protocols_list = array(); |
| 55 | 55 | foreach( $wgUrlProtocols as $prot ) { |
| 56 | | - $protocols_list[] = $prot; |
| | 56 | + if ( $prot !== '//' ) { |
| | 57 | + $protocols_list[] = $prot; |
| | 58 | + } |
| 57 | 59 | } |
| 58 | 60 | |
| 59 | 61 | $target2 = $target; |
| — | — | @@ -71,15 +73,13 @@ |
| 72 | 74 | // default |
| 73 | 75 | $protocol = 'http://'; |
| 74 | 76 | } |
| 75 | | - if ( !in_array( $protocol, $protocols_list ) ) { |
| | 77 | + if ( $protocol != '' && !in_array( $protocol, $protocols_list ) ) { |
| 76 | 78 | // unsupported protocol, show original search request |
| 77 | 79 | $target2 = $target; |
| 78 | 80 | $protocol = ''; |
| 79 | 81 | } |
| 80 | 82 | |
| 81 | | - $self = $this->getTitle(); |
| 82 | | - |
| 83 | | - $wgOut->addWikiMsg( 'linksearch-text', '<nowiki>' . $wgLang->commaList( $wgUrlProtocols ) . '</nowiki>' ); |
| | 83 | + $out->addWikiMsg( 'linksearch-text', '<nowiki>' . $this->getLanguage()->commaList( $protocols_list ) . '</nowiki>' ); |
| 84 | 84 | $s = Xml::openElement( 'form', array( 'id' => 'mw-linksearch-form', 'method' => 'get', 'action' => $GLOBALS['wgScript'] ) ) . |
| 85 | 85 | Html::hidden( 'title', $self->getPrefixedDbKey() ) . |
| 86 | 86 | '<fieldset>' . |
| Property changes on: branches/REL1_18/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 87 | 87 | Merged /trunk/phase3/includes/specials:r104033 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 88 | 88 | Merged /trunk/phase3/includes:r103328,103634,103672,103677,104033 |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 89 | 89 | Merged /trunk/phase3:r103328,103634,103672,103677,104033 |