| Index: branches/REL1_18/extensions/skins/Daddio/Daddio.class.php |
| — | — | @@ -99,8 +99,6 @@ |
| 100 | 100 | <?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?> |
| 101 | 101 | |
| 102 | 102 | <?php $this->html('bodytext') ?> |
| 103 | | - <?php if(isset($this->data['printfooter'])) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?> |
| 104 | | - <?php if(isset($this->data['debughtml'])) { $this->html('debughtml'); } ?> |
| 105 | 103 | <div class='mw_clear'></div> |
| 106 | 104 | <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 107 | 105 | <?php $this->html('dataAfterContent') ?> |
| Index: branches/REL1_18/phase3/maintenance/update.php |
| — | — | @@ -110,7 +110,7 @@ |
| 111 | 111 | |
| 112 | 112 | $shared = $this->hasOption( 'doshared' ); |
| 113 | 113 | |
| 114 | | - $updates = array('core','extensions'); |
| | 114 | + $updates = array( 'core', 'extensions', 'stats' ); |
| 115 | 115 | if( !$this->hasOption('nopurge') ) { |
| 116 | 116 | $updates[] = 'purge'; |
| 117 | 117 | } |
| Index: branches/REL1_18/phase3/maintenance/language/messages.inc |
| — | — | @@ -2014,7 +2014,6 @@ |
| 2015 | 2015 | 'sp-contributions-explain', |
| 2016 | 2016 | 'sp-contributions-footer', |
| 2017 | 2017 | 'sp-contributions-footer-anon', |
| 2018 | | - 'sp-contributions-showsizediff', |
| 2019 | 2018 | ), |
| 2020 | 2019 | 'whatlinkshere' => array( |
| 2021 | 2020 | 'whatlinkshere', |
| Index: branches/REL1_18/phase3/skins/Vector.php |
| — | — | @@ -174,9 +174,9 @@ |
| 175 | 175 | </div> |
| 176 | 176 | <!-- /jumpto --> |
| 177 | 177 | <?php endif; ?> |
| 178 | | - <!-- bodytext --> |
| 179 | | - <?php $this->html( 'bodytext' ) ?> |
| 180 | | - <!-- /bodytext --> |
| | 178 | + <!-- bodycontent --> |
| | 179 | + <?php $this->html( 'bodycontent' ) ?> |
| | 180 | + <!-- /bodycontent --> |
| 181 | 181 | <?php if ( $this->data['printfooter'] ): ?> |
| 182 | 182 | <!-- printfooter --> |
| 183 | 183 | <div class="printfooter"> |
| Index: branches/REL1_18/phase3/skins/MonoBook.php |
| — | — | @@ -88,8 +88,6 @@ |
| 89 | 89 | <?php } ?> |
| 90 | 90 | <!-- start content --> |
| 91 | 91 | <?php $this->html('bodytext') ?> |
| 92 | | - <?php if($this->data['printfooter']) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?> |
| 93 | | - <?php $this->html('debughtml'); ?> |
| 94 | 92 | <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 95 | 93 | <!-- end content --> |
| 96 | 94 | <?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> |
| Index: branches/REL1_18/phase3/skins/Modern.php |
| — | — | @@ -85,8 +85,6 @@ |
| 86 | 86 | <?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#mw_portlets"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?> |
| 87 | 87 | |
| 88 | 88 | <?php $this->html('bodytext') ?> |
| 89 | | - <?php if($this->data['printfooter']) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?> |
| 90 | | - <?php $this->html('debughtml'); ?> |
| 91 | 89 | <div class='mw_clear'></div> |
| 92 | 90 | <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 93 | 91 | <?php $this->html ('dataAfterContent') ?> |
| Index: branches/REL1_18/phase3/docs/hooks.txt |
| — | — | @@ -869,6 +869,7 @@ |
| 870 | 870 | $title: Title object of page |
| 871 | 871 | $url: string value as output (out parameter, can modify) |
| 872 | 872 | $query: query options passed to Title::getCanonicalURL() |
| | 873 | +$variant: variant passed to Title::getCanonicalURL() |
| 873 | 874 | |
| 874 | 875 | 'GetDefaultSortkey': Override the default sortkey for a page. |
| 875 | 876 | $title: Title object that we need to get a sortkey for |
| — | — | @@ -878,11 +879,13 @@ |
| 879 | 880 | $title: Title object of page |
| 880 | 881 | $url: string value as output (out parameter, can modify) |
| 881 | 882 | $query: query options passed to Title::getFullURL() |
| | 883 | +$variant: variant passed to Title::getFullURL() |
| 882 | 884 | |
| 883 | 885 | 'GetInternalURL': modify fully-qualified URLs used for squid cache purging |
| 884 | 886 | $title: Title object of page |
| 885 | 887 | $url: string value as output (out parameter, can modify) |
| 886 | 888 | $query: query options passed to Title::getInternalURL() |
| | 889 | +$variant: variant passed to Title::getFullURL() |
| 887 | 890 | |
| 888 | 891 | 'GetIP': modify the ip of the current user (called only once) |
| 889 | 892 | &$ip: string holding the ip as determined so far |
| — | — | @@ -896,6 +899,7 @@ |
| 897 | 900 | $title: Title object of page |
| 898 | 901 | $url: string value as output (out parameter, can modify) |
| 899 | 902 | $query: query options passed to Title::getLocalURL() |
| | 903 | +$variant: variant passed to Title::getLocalURL() |
| 900 | 904 | |
| 901 | 905 | 'GetMetadataVersion': modify the image metadata version currently in use. This is |
| 902 | 906 | used when requesting image metadata from a ForiegnApiRepo. Media handlers |
| Property changes on: branches/REL1_18/phase3/docs/hooks.txt |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 903 | 907 | Merged /trunk/phase3/docs/hooks.txt:r96163,96174,96212,96217-96218,96271,96273,96306,96342,96358 |
| Index: branches/REL1_18/phase3/includes/parser/Parser.php |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | * changes in an incompatible way, so the parser cache |
| 55 | 55 | * can automatically discard old data. |
| 56 | 56 | */ |
| 57 | | - const VERSION = '1.6.5'; |
| | 57 | + const VERSION = '1.6.4'; |
| 58 | 58 | |
| 59 | 59 | /** |
| 60 | 60 | * Update this version number when the output of serialiseHalfParsedText() |
| — | — | @@ -5149,12 +5149,14 @@ |
| 5150 | 5150 | * pull the given section along with its lower-level subsections. If the section is |
| 5151 | 5151 | * not found, $mode=get will return $newtext, and $mode=replace will return $text. |
| 5152 | 5152 | * |
| | 5153 | + * Section 0 is always considered to exist, even if it only contains the empty |
| | 5154 | + * string. If $text is the empty string and section 0 is replaced, $newText is |
| | 5155 | + * returned. |
| | 5156 | + * |
| 5153 | 5157 | * @param $mode String: one of "get" or "replace" |
| 5154 | 5158 | * @param $newText String: replacement text for section data. |
| 5155 | 5159 | * @return String: for "get", the extracted section text. |
| 5156 | 5160 | * for "replace", the whole page with the section replaced. |
| 5157 | | - * If the page is empty and section 0 is requested, $text (as '') |
| 5158 | | - * is returned |
| 5159 | 5161 | */ |
| 5160 | 5162 | private function extractSections( $text, $section, $mode, $newText='' ) { |
| 5161 | 5163 | global $wgTitle; # not generally used but removes an ugly failure mode |
| — | — | @@ -5171,6 +5173,25 @@ |
| 5172 | 5174 | $flags |= self::PTD_FOR_INCLUSION; |
| 5173 | 5175 | } |
| 5174 | 5176 | } |
| | 5177 | + |
| | 5178 | + # Check for empty input |
| | 5179 | + if ( strval( $text ) === '' ) { |
| | 5180 | + # Only sections 0 and T-0 exist in an empty document |
| | 5181 | + if ( $sectionIndex == 0 ) { |
| | 5182 | + if ( $mode === 'get' ) { |
| | 5183 | + return ''; |
| | 5184 | + } else { |
| | 5185 | + return $newText; |
| | 5186 | + } |
| | 5187 | + } else { |
| | 5188 | + if ( $mode === 'get' ) { |
| | 5189 | + return $newText; |
| | 5190 | + } else { |
| | 5191 | + return $text; |
| | 5192 | + } |
| | 5193 | + } |
| | 5194 | + } |
| | 5195 | + |
| 5175 | 5196 | # Preprocess the text |
| 5176 | 5197 | $root = $this->preprocessToDom( $text, $flags ); |
| 5177 | 5198 | |
| — | — | @@ -5182,10 +5203,6 @@ |
| 5183 | 5204 | if ( $sectionIndex == 0 ) { |
| 5184 | 5205 | # Section zero doesn't nest, level=big |
| 5185 | 5206 | $targetLevel = 1000; |
| 5186 | | - if ( !$node ) { |
| 5187 | | - # The page definitely exists - we checked that earlier - so it must be blank: see bug #14005 |
| 5188 | | - return $text; |
| 5189 | | - } |
| 5190 | 5207 | } else { |
| 5191 | 5208 | while ( $node ) { |
| 5192 | 5209 | if ( $node->getName() === 'h' ) { |
| — | — | @@ -5268,7 +5285,8 @@ |
| 5269 | 5286 | |
| 5270 | 5287 | /** |
| 5271 | 5288 | * This function returns $oldtext after the content of the section |
| 5272 | | - * specified by $section has been replaced with $text. |
| | 5289 | + * specified by $section has been replaced with $text. If the target |
| | 5290 | + * section does not exist, $oldtext is returned unchanged. |
| 5273 | 5291 | * |
| 5274 | 5292 | * @param $oldtext String: former text of the article |
| 5275 | 5293 | * @param $section Numeric: section identifier |
| Index: branches/REL1_18/phase3/includes/db/DatabaseSqlite.php |
| — | — | @@ -714,11 +714,6 @@ |
| 715 | 715 | return parent::buildLike( $params ) . "ESCAPE '\' "; |
| 716 | 716 | } |
| 717 | 717 | |
| 718 | | - public function dropTable( $tableName, $fName = 'DatabaseSqlite::dropTable' ) { |
| 719 | | - $sql = 'DROP TABLE IF EXISTS ' . $this->tableName( $tableName ); |
| 720 | | - return $this->query( $sql, $fName ); |
| 721 | | - } |
| 722 | | - |
| 723 | 718 | /** |
| 724 | 719 | * @return string |
| 725 | 720 | */ |
| Index: branches/REL1_18/phase3/includes/installer/DatabaseUpdater.php |
| — | — | @@ -188,7 +188,7 @@ |
| 189 | 189 | * |
| 190 | 190 | * @param $what Array: what updates to perform |
| 191 | 191 | */ |
| 192 | | - public function doUpdates( $what = array( 'core', 'extensions', 'purge' ) ) { |
| | 192 | + public function doUpdates( $what = array( 'core', 'extensions', 'purge', 'stats' ) ) { |
| 193 | 193 | global $wgVersion; |
| 194 | 194 | |
| 195 | 195 | $what = array_flip( $what ); |
| — | — | @@ -205,7 +205,7 @@ |
| 206 | 206 | if( isset( $what['purge'] ) ) { |
| 207 | 207 | $this->purgeCache(); |
| 208 | 208 | } |
| 209 | | - if ( isset( $what['core'] ) ) { |
| | 209 | + if ( isset( $what['stats'] ) ) { |
| 210 | 210 | $this->checkStats(); |
| 211 | 211 | } |
| 212 | 212 | } |
| Index: branches/REL1_18/phase3/includes/installer/OracleUpdater.php |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | * |
| 152 | 152 | * @param $what array |
| 153 | 153 | */ |
| 154 | | - public function doUpdates( $what = array( 'core', 'extensions', 'purge' ) ) { |
| | 154 | + public function doUpdates( $what = array( 'core', 'extensions', 'purge', 'stats' ) ) { |
| 155 | 155 | parent::doUpdates( $what ); |
| 156 | 156 | |
| 157 | 157 | $this->db->query( 'BEGIN fill_wiki_info; END;' ); |
| Index: branches/REL1_18/phase3/includes/Title.php |
| — | — | @@ -866,7 +866,7 @@ |
| 867 | 867 | # Finally, add the fragment. |
| 868 | 868 | $url .= $this->getFragmentForURL(); |
| 869 | 869 | |
| 870 | | - wfRunHooks( 'GetFullURL', array( &$this, &$url, $query ) ); |
| | 870 | + wfRunHooks( 'GetFullURL', array( &$this, &$url, $query, $variant ) ); |
| 871 | 871 | return $url; |
| 872 | 872 | } |
| 873 | 873 | |
| — | — | @@ -1026,7 +1026,7 @@ |
| 1027 | 1027 | global $wgInternalServer, $wgServer; |
| 1028 | 1028 | $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer; |
| 1029 | 1029 | $url = wfExpandUrl( $server . $this->getLocalURL( $query, $variant ), PROTO_HTTP ); |
| 1030 | | - wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query ) ); |
| | 1030 | + wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query, $variant ) ); |
| 1031 | 1031 | return $url; |
| 1032 | 1032 | } |
| 1033 | 1033 | |
| — | — | @@ -1044,7 +1044,7 @@ |
| 1045 | 1045 | public function getCanonicalURL( $query = '', $variant = false ) { |
| 1046 | 1046 | global $wgCanonicalServer; |
| 1047 | 1047 | $url = wfExpandUrl( $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(), PROTO_CANONICAL ); |
| 1048 | | - wfRunHooks( '', array( &$this, &$url, $query ) ); |
| | 1048 | + wfRunHooks( 'GetCanonicalURL', array( &$this, &$url, $query, $variant ) ); |
| 1049 | 1049 | return $url; |
| 1050 | 1050 | } |
| 1051 | 1051 | |
| Property changes on: branches/REL1_18/phase3/includes/Title.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1052 | 1052 | Merged /trunk/phase3/includes/Title.php:r96163,96174,96212,96217-96218,96271,96273,96306,96342,96358 |
| Index: branches/REL1_18/phase3/includes/SkinLegacy.php |
| — | — | @@ -74,10 +74,6 @@ |
| 75 | 75 | $this->html( 'headelement' ); |
| 76 | 76 | echo $this->beforeContent(); |
| 77 | 77 | $this->html( 'bodytext' ); |
| 78 | | - echo '<div class="printfooter">'; |
| 79 | | - $this->html( 'printfooter' ); |
| 80 | | - echo '</div>'; |
| 81 | | - $this->html( 'debughtml' ); |
| 82 | 78 | echo "\n"; |
| 83 | 79 | echo $this->afterContent(); |
| 84 | 80 | $this->html( 'dataAfterContent' ); |
| Index: branches/REL1_18/phase3/includes/SkinTemplate.php |
| — | — | @@ -514,6 +514,15 @@ |
| 515 | 515 | wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" ); |
| 516 | 516 | } |
| 517 | 517 | |
| | 518 | + // Set the bodytext to another key so that skins can just output it on it's own |
| | 519 | + // and output printfooter and debughtml separately |
| | 520 | + $tpl->set( 'bodycontent', $tpl->data['bodytext'] ); |
| | 521 | + |
| | 522 | + // Append printfooter and debughtml onto bodytext so that skins that were already |
| | 523 | + // using bodytext before they were split out don't suddenly start not outputting information |
| | 524 | + $tpl->data['bodytext'] .= Html::element( 'div', array( 'class' => 'printfooter' ), "\n{$tpl->data['printfooter']}" ) . "\n"; |
| | 525 | + $tpl->data['bodytext'] .= $tpl->data['debughtml']; |
| | 526 | + |
| 518 | 527 | // allow extensions adding stuff after the page content. |
| 519 | 528 | // See Skin::afterContentHook() for further documentation. |
| 520 | 529 | $tpl->set( 'dataAfterContent', $this->afterContentHook() ); |
| Index: branches/REL1_18/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -69,7 +69,6 @@ |
| 70 | 70 | $this->opts['limit'] = $wgRequest->getInt( 'limit', $wgUser->getOption('rclimit') ); |
| 71 | 71 | $this->opts['target'] = $target; |
| 72 | 72 | $this->opts['topOnly'] = $wgRequest->getBool( 'topOnly' ); |
| 73 | | - $this->opts['showSizeDiff'] = $wgRequest->getBool( 'showSizeDiff' ); |
| 74 | 73 | |
| 75 | 74 | $nt = Title::makeTitleSafe( NS_USER, $target ); |
| 76 | 75 | if( !$nt ) { |
| — | — | @@ -127,9 +126,6 @@ |
| 128 | 127 | if ( $this->opts['topOnly'] ) { |
| 129 | 128 | $apiParams['toponly'] = true; |
| 130 | 129 | } |
| 131 | | - if ( $this->opts['showSizeDiff'] ) { |
| 132 | | - $apiParams['showsizediff'] = true; |
| 133 | | - } |
| 134 | 130 | if ( $this->opts['deletedOnly'] ) { |
| 135 | 131 | $apiParams['deletedonly'] = true; |
| 136 | 132 | } |
| — | — | @@ -166,7 +162,6 @@ |
| 167 | 163 | 'month' => $this->opts['month'], |
| 168 | 164 | 'deletedOnly' => $this->opts['deletedOnly'], |
| 169 | 165 | 'topOnly' => $this->opts['topOnly'], |
| 170 | | - 'showSizeDiff' => $this->opts['showSizeDiff'], |
| 171 | 166 | ) ); |
| 172 | 167 | if( !$pager->getNumRows() ) { |
| 173 | 168 | $wgOut->addWikiMsg( 'nocontribs', $target ); |
| — | — | @@ -380,14 +375,10 @@ |
| 381 | 376 | $this->opts['topOnly'] = false; |
| 382 | 377 | } |
| 383 | 378 | |
| 384 | | - if( !isset( $this->opts['showSizeDiff'] ) ) { |
| 385 | | - $this->opts['showSizeDiff'] = !$wgMiserMode; |
| 386 | | - } |
| 387 | | - |
| 388 | 379 | $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'class' => 'mw-contributions-form' ) ); |
| 389 | 380 | |
| 390 | 381 | # Add hidden params for tracking except for parameters in $skipParameters |
| 391 | | - $skipParameters = array( 'namespace', 'deletedOnly', 'target', 'contribs', 'year', 'month', 'topOnly', 'showSizeDiff' ); |
| | 382 | + $skipParameters = array( 'namespace', 'deletedOnly', 'target', 'contribs', 'year', 'month', 'topOnly' ); |
| 392 | 383 | foreach ( $this->opts as $name => $value ) { |
| 393 | 384 | if( in_array( $name, $skipParameters ) ) { |
| 394 | 385 | continue; |
| — | — | @@ -397,15 +388,11 @@ |
| 398 | 389 | |
| 399 | 390 | $tagFilter = ChangeTags::buildTagFilterSelector( $this->opts['tagFilter'] ); |
| 400 | 391 | |
| 401 | | - $fNS = ''; |
| 402 | | - $fShowDiff = ''; |
| 403 | | - if ( !$wgMiserMode ) { |
| 404 | | - $fNS = Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ), |
| 405 | | - Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' . |
| 406 | | - Xml::namespaceSelector( $this->opts['namespace'], '' ) |
| 407 | | - ); |
| 408 | | - $fShowDiff = Xml::checkLabel( wfMsg( 'sp-contributions-showsizediff' ), 'showSizeDiff', 'mw-show-size-diff', $this->opts['showSizeDiff'] ); |
| 409 | | - } |
| | 392 | + $fNS = ( $wgMiserMode ) ? '' : |
| | 393 | + Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ), |
| | 394 | + Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' . |
| | 395 | + Xml::namespaceSelector( $this->opts['namespace'], '' ) |
| | 396 | + ); |
| 410 | 397 | |
| 411 | 398 | $f .= Xml::fieldset( wfMsg( 'sp-contributions-search' ) ) . |
| 412 | 399 | Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parsemag' ) ), |
| — | — | @@ -421,7 +408,6 @@ |
| 422 | 409 | 'deletedOnly', 'mw-show-deleted-only', $this->opts['deletedOnly'] ) . '<br />' . |
| 423 | 410 | Xml::tags( 'p', null, Xml::checkLabel( wfMsg( 'sp-contributions-toponly' ), |
| 424 | 411 | 'topOnly', 'mw-show-top-only', $this->opts['topOnly'] ) ) . |
| 425 | | - $fShowDiff. |
| 426 | 412 | ( $tagFilter ? Xml::tags( 'p', null, implode( ' ', $tagFilter ) ) : '' ) . |
| 427 | 413 | Html::rawElement( 'p', array( 'style' => 'white-space: nowrap' ), |
| 428 | 414 | Xml::dateMenu( $this->opts['year'], $this->opts['month'] ) . ' ' . |
| — | — | @@ -462,7 +448,6 @@ |
| 463 | 449 | |
| 464 | 450 | $this->deletedOnly = !empty( $options['deletedOnly'] ); |
| 465 | 451 | $this->topOnly = !empty( $options['topOnly'] ); |
| 466 | | - $this->showSizeDiff = !empty( $options['showSizeDiff'] ); |
| 467 | 452 | |
| 468 | 453 | $year = isset( $options['year'] ) ? $options['year'] : false; |
| 469 | 454 | $month = isset( $options['month'] ) ? $options['month'] : false; |
| — | — | @@ -482,7 +467,7 @@ |
| 483 | 468 | } |
| 484 | 469 | |
| 485 | 470 | function getQueryInfo() { |
| 486 | | - global $wgUser, $wgMiserMode; |
| | 471 | + global $wgUser; |
| 487 | 472 | list( $tables, $index, $userCond, $join_cond ) = $this->getUserCond(); |
| 488 | 473 | |
| 489 | 474 | $conds = array_merge( $userCond, $this->getNamespaceCond() ); |
| — | — | @@ -495,25 +480,18 @@ |
| 496 | 481 | } |
| 497 | 482 | $join_cond['page'] = array( 'INNER JOIN', 'page_id=rev_page' ); |
| 498 | 483 | |
| 499 | | - $fields = array( |
| 500 | | - 'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'page_is_redirect', |
| 501 | | - 'page_len','rev_id', 'rev_page', 'rev_text_id', 'rev_timestamp', 'rev_comment', |
| 502 | | - 'rev_minor_edit', 'rev_user', 'rev_user_text', 'rev_parent_id', 'rev_deleted', |
| 503 | | - 'rev_len' |
| 504 | | - ); |
| 505 | | - if ( $this->showSizeDiff && !$wgMiserMode ) { |
| 506 | | - $fields = array_merge( $fields, array( 'rc_old_len', 'rc_new_len' ) ); |
| 507 | | - array_unshift( $tables, 'recentchanges' ); |
| 508 | | - $join_cond['recentchanges'] = array( 'INNER JOIN', "rev_id = rc_this_oldid" ); |
| 509 | | - } |
| 510 | | - |
| 511 | 484 | $queryInfo = array( |
| 512 | 485 | 'tables' => $tables, |
| 513 | | - 'fields' => $fields, |
| | 486 | + 'fields' => array( |
| | 487 | + 'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'page_is_redirect', |
| | 488 | + 'page_len','rev_id', 'rev_page', 'rev_text_id', 'rev_timestamp', 'rev_comment', |
| | 489 | + 'rev_minor_edit', 'rev_user', 'rev_user_text', 'rev_parent_id', 'rev_deleted' |
| | 490 | + ), |
| 514 | 491 | 'conds' => $conds, |
| 515 | 492 | 'options' => array( 'USE INDEX' => array('revision' => $index) ), |
| 516 | 493 | 'join_conds' => $join_cond |
| 517 | 494 | ); |
| | 495 | + |
| 518 | 496 | ChangeTags::modifyDisplayQuery( |
| 519 | 497 | $queryInfo['tables'], |
| 520 | 498 | $queryInfo['fields'], |
| — | — | @@ -527,10 +505,9 @@ |
| 528 | 506 | return $queryInfo; |
| 529 | 507 | } |
| 530 | 508 | |
| 531 | | - function getUserCond() { |
| | 509 | + function getUserCond() { |
| 532 | 510 | $condition = array(); |
| 533 | 511 | $join_conds = array(); |
| 534 | | - |
| 535 | 512 | if( $this->target == 'newbies' ) { |
| 536 | 513 | $tables = array( 'user_groups', 'page', 'revision' ); |
| 537 | 514 | $max = $this->mDb->selectField( 'user', 'max(user_id)', false, __METHOD__ ); |
| — | — | @@ -687,13 +664,8 @@ |
| 688 | 665 | } |
| 689 | 666 | |
| 690 | 667 | $diffHistLinks = '(' . $difftext . $this->messages['pipe-separator'] . $histlink . ')'; |
| | 668 | + $ret = "{$del}{$d} {$diffHistLinks} {$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}"; |
| 691 | 669 | |
| 692 | | - |
| 693 | | - $diffOut = ' . . ' . $wgLang->getDirMark() . ( $this->showSizeDiff ? |
| 694 | | - ChangesList::showCharacterDifference( $row->rc_old_len, $row->rc_new_len ) : Linker::formatRevisionSize( $row->rev_len ) ); |
| 695 | | - |
| 696 | | - $ret = "{$del}{$d} {$diffHistLinks} {$nflag}{$mflag} {$link}{$diffOut}{$userlink} {$comment} {$topmarktext}"; |
| 697 | | - |
| 698 | 670 | # Denote if username is redacted for this edit |
| 699 | 671 | if( $rev->isDeleted( Revision::DELETED_USER ) ) { |
| 700 | 672 | $ret .= " <strong>" . wfMsgHtml('rev-deleted-user-contribs') . "</strong>"; |
| Index: branches/REL1_18/phase3/includes/specials/SpecialChangePassword.php |
| — | — | @@ -64,6 +64,9 @@ |
| 65 | 65 | |
| 66 | 66 | if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) { |
| 67 | 67 | try { |
| | 68 | + if ( isset( $_SESSION['wsDomain'] ) ) { |
| | 69 | + $this->mDomain = $_SESSION['wsDomain']; |
| | 70 | + } |
| 68 | 71 | $wgAuth->setDomain( $this->mDomain ); |
| 69 | 72 | if( !$wgAuth->allowPasswordChange() ) { |
| 70 | 73 | $this->error( wfMsg( 'resetpass_forbidden' ) ); |
| Index: branches/REL1_18/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2986,7 +2986,6 @@ |
| 2987 | 2987 | 'sp-contributions-explain' => '', # only translate this message to other languages if you have to change it |
| 2988 | 2988 | 'sp-contributions-footer' => '-', # do not translate or duplicate this message to other languages |
| 2989 | 2989 | 'sp-contributions-footer-anon' => '-', # do not translate or duplicate this message to other languages |
| 2990 | | -'sp-contributions-showsizediff' => 'Display difference in page size', |
| 2991 | 2990 | |
| 2992 | 2991 | # What links here |
| 2993 | 2992 | 'whatlinkshere' => 'What links here', |