| Index: trunk/phase3/maintenance/archives/patch-page_key.sql |
| — | — | @@ -1,5 +0,0 @@ |
| 2 | | -ALTER TABLE /*$wgDBprefix*/page |
| 3 | | - ADD page_key VARCHAR(255) BINARY NOT NULL; |
| 4 | | -ALTER TABLE /*$wgDBprefix*/page |
| 5 | | - ADD INDEX name_key (page_namespace, page_key); |
| 6 | | - |
| Index: trunk/phase3/maintenance/updaters.inc |
| — | — | @@ -82,7 +82,6 @@ |
| 83 | 83 | array( 'oldimage', 'oi_metadata', 'patch-oi_metadata.sql'), |
| 84 | 84 | array( 'archive', 'ar_page', 'patch-archive-ar_page.sql'), |
| 85 | 85 | array( 'image', 'img_sha1', 'patch-img_sha1.sql' ), |
| 86 | | - array( 'page', 'page_key', 'patch-page_key.sql' ), |
| 87 | 86 | ); |
| 88 | 87 | |
| 89 | 88 | # For extensions only, should be populated via hooks |
| Index: trunk/phase3/maintenance/tables.sql |
| — | — | @@ -190,9 +190,6 @@ |
| 191 | 191 | -- Spaces are transformed into underscores in title storage. |
| 192 | 192 | page_title varchar(255) binary NOT NULL, |
| 193 | 193 | |
| 194 | | - -- page_title in uppercase. Used for case-insensitive title searching. |
| 195 | | - page_key varchar(255) binary NOT NULL, |
| 196 | | - |
| 197 | 194 | -- Comma-separated set of permission keys indicating who |
| 198 | 195 | -- can move or edit the page. |
| 199 | 196 | page_restrictions tinyblob NOT NULL, |
| — | — | @@ -227,7 +224,6 @@ |
| 228 | 225 | |
| 229 | 226 | PRIMARY KEY page_id (page_id), |
| 230 | 227 | UNIQUE INDEX name_title (page_namespace,page_title), |
| 231 | | - INDEX name_key (page_namespace, page_key), |
| 232 | 228 | |
| 233 | 229 | -- Special-purpose indexes |
| 234 | 230 | INDEX (page_random), |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -262,7 +262,6 @@ |
| 263 | 263 | 'page_id', |
| 264 | 264 | 'page_namespace', |
| 265 | 265 | 'page_title', |
| 266 | | - 'page_key', |
| 267 | 266 | 'page_restrictions', |
| 268 | 267 | 'page_counter', |
| 269 | 268 | 'page_is_redirect', |
| — | — | @@ -1002,7 +1001,6 @@ |
| 1003 | 1002 | * @private |
| 1004 | 1003 | */ |
| 1005 | 1004 | function insertOn( $dbw ) { |
| 1006 | | - global $wgContLang; |
| 1007 | 1005 | wfProfileIn( __METHOD__ ); |
| 1008 | 1006 | |
| 1009 | 1007 | $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' ); |
| — | — | @@ -1010,7 +1008,6 @@ |
| 1011 | 1009 | 'page_id' => $page_id, |
| 1012 | 1010 | 'page_namespace' => $this->mTitle->getNamespace(), |
| 1013 | 1011 | 'page_title' => $this->mTitle->getDBkey(), |
| 1014 | | - 'page_key' => $wgContLang->caseFold($this->mTitle->getDBkey()), |
| 1015 | 1012 | 'page_counter' => 0, |
| 1016 | 1013 | 'page_restrictions' => '', |
| 1017 | 1014 | 'page_is_redirect' => 0, # Will set this shortly... |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -2126,7 +2126,7 @@ |
| 2127 | 2127 | * be a redirect |
| 2128 | 2128 | */ |
| 2129 | 2129 | private function moveOverExistingRedirect( &$nt, $reason = '' ) { |
| 2130 | | - global $wgUseSquid, $wgContLang; |
| | 2130 | + global $wgUseSquid; |
| 2131 | 2131 | $fname = 'Title::moveOverExistingRedirect'; |
| 2132 | 2132 | $comment = wfMsgForContent( '1movedto2_redir', $this->getPrefixedText(), $nt->getPrefixedText() ); |
| 2133 | 2133 | |
| — | — | @@ -2156,7 +2156,6 @@ |
| 2157 | 2157 | 'page_touched' => $dbw->timestamp($now), |
| 2158 | 2158 | 'page_namespace' => $nt->getNamespace(), |
| 2159 | 2159 | 'page_title' => $nt->getDBkey(), |
| 2160 | | - 'page_key' => $wgContLang->caseFold($nt->getDBkey()), |
| 2161 | 2160 | 'page_latest' => $nullRevId, |
| 2162 | 2161 | ), |
| 2163 | 2162 | /* WHERE */ array( 'page_id' => $oldid ), |
| — | — | @@ -2204,7 +2203,7 @@ |
| 2205 | 2204 | * @param Title &$nt the new Title |
| 2206 | 2205 | */ |
| 2207 | 2206 | private function moveToNewTitle( &$nt, $reason = '' ) { |
| 2208 | | - global $wgUseSquid, $wgContLang; |
| | 2207 | + global $wgUseSquid; |
| 2209 | 2208 | $fname = 'MovePageForm::moveToNewTitle'; |
| 2210 | 2209 | $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() ); |
| 2211 | 2210 | if ( $reason ) { |
| — | — | @@ -2227,7 +2226,6 @@ |
| 2228 | 2227 | 'page_touched' => $now, |
| 2229 | 2228 | 'page_namespace' => $nt->getNamespace(), |
| 2230 | 2229 | 'page_title' => $nt->getDBkey(), |
| 2231 | | - 'page_key' => $wgContLang->caseFold($nt->getDBkey()), |
| 2232 | 2230 | 'page_latest' => $nullRevId, |
| 2233 | 2231 | ), |
| 2234 | 2232 | /* WHERE */ array( 'page_id' => $oldid ), |