| Index: branches/REL1_19/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -151,7 +151,6 @@ |
| 152 | 152 | * Allow moving the associated talk pages of subpages even if the base page |
| 153 | 153 | has no subpage. |
| 154 | 154 | * Per page edit-notices now work in namespaces without subpages enabled. |
| 155 | | -* (bug 30245) Use the correct way to construct a log page title. |
| 156 | 155 | * (bug 31081) $wgEnotifUseJobQ caused many unnecessary jobs to be queued. |
| 157 | 156 | * (bug 30202) File names are now restricted on upload to 240 bytes, because of |
| 158 | 157 | restrictions on some of the database fields. |
| Index: branches/REL1_19/phase3/includes/ChangesList.php |
| — | — | @@ -541,7 +541,7 @@ |
| 542 | 542 | if( $rc->mAttribs['rc_type'] == RC_MOVE || $rc->mAttribs['rc_type'] == RC_MOVE_OVER_REDIRECT ) { |
| 543 | 543 | // Log entries |
| 544 | 544 | } elseif( $rc->mAttribs['rc_log_type'] ) { |
| 545 | | - $logtitle = SpecialPage::getTitleFor( 'Log', $rc->mAttribs['rc_log_type'] ); |
| | 545 | + $logtitle = Title::newFromText( 'Log/'.$rc->mAttribs['rc_log_type'], NS_SPECIAL ); |
| 546 | 546 | $this->insertLog( $s, $logtitle, $rc->mAttribs['rc_log_type'] ); |
| 547 | 547 | // Log entries (old format) or log targets, and special pages |
| 548 | 548 | } elseif( $rc->mAttribs['rc_namespace'] == NS_SPECIAL ) { |
| Index: branches/REL1_19/phase3/includes/AutoLoader.php |
| — | — | @@ -366,7 +366,6 @@ |
| 367 | 367 | 'ApiUpload' => 'includes/api/ApiUpload.php', |
| 368 | 368 | 'ApiUserrights' => 'includes/api/ApiUserrights.php', |
| 369 | 369 | 'ApiWatch' => 'includes/api/ApiWatch.php', |
| 370 | | - 'UsageException' => 'includes/api/ApiMain.php', |
| 371 | 370 | |
| 372 | 371 | # includes/cache |
| 373 | 372 | 'CacheDependency' => 'includes/cache/CacheDependency.php', |
| — | — | @@ -388,10 +387,7 @@ |
| 389 | 388 | 'TitleDependency' => 'includes/cache/CacheDependency.php', |
| 390 | 389 | 'TitleListDependency' => 'includes/cache/CacheDependency.php', |
| 391 | 390 | |
| 392 | | - # includes/conf |
| 393 | | - 'Conf' => 'includes/conf/Conf.php', |
| 394 | | - 'DatabaseConf' => 'includes/conf/DatabaseConf.php', |
| 395 | | - 'DefaultSettings' => 'includes/conf/DefaultSettings.php', |
| | 391 | + 'UsageException' => 'includes/api/ApiMain.php', |
| 396 | 392 | |
| 397 | 393 | # includes/context |
| 398 | 394 | 'ContextSource' => 'includes/context/ContextSource.php', |
| Index: branches/REL1_19/phase3/includes/User.php |
| — | — | @@ -2753,14 +2753,6 @@ |
| 2754 | 2754 | |
| 2755 | 2755 | $this->load(); |
| 2756 | 2756 | if ( 0 == $this->mId ) return; |
| 2757 | | - if ( !$this->mToken ) { |
| 2758 | | - // When token is empty or NULL generate a new one and then save it to the database |
| 2759 | | - // This allows a wiki to re-secure itself after a leak of it's user table or $wgSecretKey |
| 2760 | | - // Simply by setting every cell in the user_token column to NULL and letting them be |
| 2761 | | - // regenerated as users log back into the wiki. |
| 2762 | | - $this->setToken(); |
| 2763 | | - $this->saveSettings(); |
| 2764 | | - } |
| 2765 | 2757 | $session = array( |
| 2766 | 2758 | 'wsUserID' => $this->mId, |
| 2767 | 2759 | 'wsToken' => $this->mToken, |
| Index: branches/REL1_19/phase3/includes/RecentChange.php |
| — | — | @@ -672,7 +672,7 @@ |
| 673 | 673 | $wgCanonicalServer, $wgScript; |
| 674 | 674 | |
| 675 | 675 | if( $this->mAttribs['rc_type'] == RC_LOG ) { |
| 676 | | - $titleObj = SpecialPage::getTitleFor( 'Log', $this->mAttribs['rc_log_type'] ); |
| | 676 | + $titleObj = Title::newFromText( 'Log/' . $this->mAttribs['rc_log_type'], NS_SPECIAL ); |
| 677 | 677 | } else { |
| 678 | 678 | $titleObj =& $this->getTitle(); |
| 679 | 679 | } |
| Index: branches/REL1_19/phase3/maintenance/tables.sql |
| — | — | @@ -1473,14 +1473,4 @@ |
| 1474 | 1474 | ) /*$wgDBTableOptions*/; |
| 1475 | 1475 | CREATE UNIQUE INDEX /*i*/md_module_skin ON /*_*/module_deps (md_module, md_skin); |
| 1476 | 1476 | |
| 1477 | | -CREATE TABLE /*_*/config ( |
| 1478 | | - -- Config var name |
| 1479 | | - cf_name varbinary(255) NOT NULL PRIMARY KEY, |
| 1480 | | - -- Config var value |
| 1481 | | - cf_value blob NOT NULL |
| 1482 | | -) /*$wgDBTableOptions*/; |
| 1483 | | -CREATE INDEX /*i*/cf_name_value ON /*_*/config (cf_name,cf_value(255)); |
| 1484 | | - |
| 1485 | 1477 | -- vim: sw=2 sts=2 et |
| Index: branches/REL1_19/phase3/maintenance/archives/patch-config.sql |
| — | — | @@ -1,9 +0,0 @@ |
| 2 | | -CREATE TABLE /*_*/config ( |
| 3 | | - -- Config var name |
| 4 | | - cf_name varbinary(255) NOT NULL PRIMARY KEY, |
| 5 | | - -- Config var value |
| 6 | | - cf_value blob NOT NULL |
| 7 | | -) /*$wgDBTableOptions*/; |
| 8 | | -CREATE INDEX /*i*/cf_name_value ON /*_*/config (cf_name,cf_value(255)); |