| Index: trunk/phase3/maintenance/archives/patch-rd_fragment.sql |
| — | — | @@ -1,4 +0,0 @@ |
| 2 | | - |
| 3 | | -ALTER TABLE /*$wgDBprefix*/redirect |
| 4 | | - ADD rd_fragment varchar(255) binary DEFAULT NULL; |
| \ No newline at end of file |
| Index: trunk/phase3/maintenance/archives/patch-rd_interwiki.sql |
| — | — | @@ -1,4 +0,0 @@ |
| 2 | | - |
| 3 | | -ALTER TABLE /*$wgDBprefix*/redirect |
| 4 | | - ADD rd_interwiki varchar(32) default NULL; |
| \ No newline at end of file |
| Index: trunk/phase3/maintenance/updaters.inc |
| — | — | @@ -143,10 +143,6 @@ |
| 144 | 144 | array( 'maybe_do_profiling_memory_update' ), |
| 145 | 145 | array( 'do_filearchive_indices_update' ), |
| 146 | 146 | array( 'update_password_format' ), |
| 147 | | - |
| 148 | | - // 1.14 |
| 149 | | - array( 'add_field', 'redirect', 'rd_interwiki', 'patch-rd_interwiki.sql' ), |
| 150 | | - array( 'add_field', 'redirect', 'rd_fragment', 'patch-rd_fragment.sql' ), |
| 151 | 147 | ); |
| 152 | 148 | |
| 153 | 149 | |
| — | — | @@ -1720,4 +1716,3 @@ |
| 1721 | 1717 | return; |
| 1722 | 1718 | } |
| 1723 | 1719 | |
| 1724 | | - |
| Index: trunk/phase3/maintenance/tables.sql |
| — | — | @@ -1157,8 +1157,6 @@ |
| 1158 | 1158 | -- goes by. |
| 1159 | 1159 | rd_namespace int NOT NULL default '0', |
| 1160 | 1160 | rd_title varchar(255) binary NOT NULL default '', |
| 1161 | | - rd_interwiki varchar(32) default NULL, |
| 1162 | | - rd_fragment varchar(255) binary DEFAULT NULL, |
| 1163 | 1161 | |
| 1164 | 1162 | PRIMARY KEY rd_from (rd_from), |
| 1165 | 1163 | KEY rd_ns_title (rd_namespace,rd_title,rd_from) |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -103,9 +103,7 @@ |
| 104 | 104 | $dbw->replace('redirect', array('rd_from'), array( |
| 105 | 105 | 'rd_from' => $this->getID(), |
| 106 | 106 | 'rd_namespace' => $retval->getNamespace(), |
| 107 | | - 'rd_title' => $retval->getDBKey(), |
| 108 | | - 'rd_interwiki' => $retval->getInterwiki(), |
| 109 | | - 'rd_fragment' => $retval->getFragment(), |
| | 107 | + 'rd_title' => $retval->getDBKey() |
| 110 | 108 | ), __METHOD__); |
| 111 | 109 | return $retval; |
| 112 | 110 | } |
| — | — | @@ -1184,8 +1182,6 @@ |
| 1185 | 1183 | 'rd_namespace' => $redirectTitle->getNamespace(), |
| 1186 | 1184 | 'rd_title' => $redirectTitle->getDBkey(), |
| 1187 | 1185 | 'rd_from' => $this->getId(), |
| 1188 | | - 'rd_interwiki' => $redirectTitle->getInterwiki(), |
| 1189 | | - 'rd_fragment' => $redirectTitle->getFragment(), |
| 1190 | 1186 | ); |
| 1191 | 1187 | |
| 1192 | 1188 | $dbw->replace( 'redirect', array( 'rd_from' ), $set, __METHOD__ ); |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -41,7 +41,6 @@ |
| 42 | 42 | const AS_SPAM_ERROR = 232; |
| 43 | 43 | const AS_IMAGE_REDIRECT_ANON = 233; |
| 44 | 44 | const AS_IMAGE_REDIRECT_LOGGED = 234; |
| 45 | | - const AS_DOUBLE_REDIRECT = 235; |
| 46 | 45 | |
| 47 | 46 | var $mArticle; |
| 48 | 47 | var $mTitle; |
| — | — | @@ -59,7 +58,6 @@ |
| 60 | 59 | var $kblength = false; |
| 61 | 60 | var $missingComment = false; |
| 62 | 61 | var $missingSummary = false; |
| 63 | | - var $doubleRedirect = false; |
| 64 | 62 | var $allowBlankSummary = false; |
| 65 | 63 | var $autoSumm = ''; |
| 66 | 64 | var $hookError = ''; |
| — | — | @@ -929,11 +927,6 @@ |
| 930 | 928 | return self::AS_HOOK_ERROR; |
| 931 | 929 | } |
| 932 | 930 | |
| 933 | | - # Are we creating a double redirect? |
| 934 | | - if ( $redirectTitle = Title::newFromRedirect( $this->textbox1 ) && $redirectTitle->isRedirect() ) { |
| 935 | | - $this->doubleRedirect = $redirectTitle; |
| 936 | | - } |
| 937 | | - |
| 938 | 931 | # Handle the user preference to force summaries here, but not for null edits |
| 939 | 932 | if( $this->section != 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary') && |
| 940 | 933 | 0 != strcmp($oldtext, $text) && |
| — | — | @@ -1094,11 +1087,6 @@ |
| 1095 | 1088 | $wgOut->wrapWikiMsg( '<div id="mw-missingcommenttext">$1</div>', 'missingcommenttext' ); |
| 1096 | 1089 | } |
| 1097 | 1090 | |
| 1098 | | - if ( $this->doubleRedirect instanceof Title ) { |
| 1099 | | - $wgOut->wrapWikiMsg( '<div id="mw-creatingdoubleredirect">$1</div>', |
| 1100 | | - array( 'creatingdoubleredirect', $this->mTitle->getText(), $this->doubleRedirect->getText() ) ); |
| 1101 | | - } |
| 1102 | | - |
| 1103 | 1091 | if( $this->missingSummary && $this->section != 'new' ) { |
| 1104 | 1092 | $wgOut->wrapWikiMsg( '<div id="mw-missingsummary">$1</div>', 'missingsummary' ); |
| 1105 | 1093 | } |
| — | — | @@ -1373,9 +1361,6 @@ |
| 1374 | 1362 | // mode will show an extra newline. A bit annoying. |
| 1375 | 1363 | $encodedtext .= "\n"; |
| 1376 | 1364 | } |
| 1377 | | - if ( $this->doubleRedirect instanceof Title ) { |
| 1378 | | - $wgOut->addHTML( Xml::hidden( 'wpIgnoreDoubleRedirect', true ) ); |
| 1379 | | - } |
| 1380 | 1365 | |
| 1381 | 1366 | $wgOut->addHTML( <<<END |
| 1382 | 1367 | $recreate |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1034,8 +1034,6 @@ |
| 1035 | 1035 | 'missingcommenttext' => 'Please enter a comment below.', |
| 1036 | 1036 | 'missingcommentheader' => "'''Reminder:''' You have not provided a subject/headline for this comment. |
| 1037 | 1037 | If you click Save again, your edit will be saved without one.", |
| 1038 | | -'creatingdoubleredirect' => "'''Caution:''' You are attempting to redirect this page to [[$1]], but it redirects to |
| 1039 | | -[[$2]]. Redirects that redirect two or more times do not work.", |
| 1040 | 1038 | 'summary-preview' => 'Summary preview', |
| 1041 | 1039 | 'subject-preview' => 'Subject/headline preview', |
| 1042 | 1040 | 'blockedtitle' => 'User is blocked', |