| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -2856,7 +2856,7 @@ |
| 2857 | 2857 | */ |
| 2858 | 2858 | private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) { |
| 2859 | 2859 | global $wgUseSquid, $wgUser; |
| 2860 | | - $fname = 'Title::moveOverExistingRedirect'; |
| | 2860 | + |
| 2861 | 2861 | $comment = wfMsgForContent( '1movedto2_redir', $this->getPrefixedText(), $nt->getPrefixedText() ); |
| 2862 | 2862 | |
| 2863 | 2863 | if ( $reason ) { |
| — | — | @@ -2878,7 +2878,7 @@ |
| 2879 | 2879 | # by definition if we've got here it's rather uninteresting. |
| 2880 | 2880 | # We have to remove it so that the next step doesn't trigger |
| 2881 | 2881 | # a conflict on the unique namespace+title index... |
| 2882 | | - $dbw->delete( 'page', array( 'page_id' => $newid ), $fname ); |
| | 2882 | + $dbw->delete( 'page', array( 'page_id' => $newid ), __METHOD__ ); |
| 2883 | 2883 | if ( !$dbw->cascadingDeletes() ) { |
| 2884 | 2884 | $dbw->delete( 'revision', array( 'rev_page' => $newid ), __METHOD__ ); |
| 2885 | 2885 | global $wgUseTrackbacks; |
| — | — | @@ -2914,7 +2914,7 @@ |
| 2915 | 2915 | 'page_latest' => $nullRevId, |
| 2916 | 2916 | ), |
| 2917 | 2917 | /* WHERE */ array( 'page_id' => $oldid ), |
| 2918 | | - $fname |
| | 2918 | + __METHOD__ |
| 2919 | 2919 | ); |
| 2920 | 2920 | $nt->resetArticleID( $oldid ); |
| 2921 | 2921 | |
| — | — | @@ -2935,13 +2935,13 @@ |
| 2936 | 2936 | |
| 2937 | 2937 | # Now, we record the link from the redirect to the new title. |
| 2938 | 2938 | # It should have no other outgoing links... |
| 2939 | | - $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), $fname ); |
| | 2939 | + $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), __METHOD__ ); |
| 2940 | 2940 | $dbw->insert( 'pagelinks', |
| 2941 | 2941 | array( |
| 2942 | 2942 | 'pl_from' => $newid, |
| 2943 | 2943 | 'pl_namespace' => $nt->getNamespace(), |
| 2944 | 2944 | 'pl_title' => $nt->getDBkey() ), |
| 2945 | | - $fname ); |
| | 2945 | + __METHOD__ ); |
| 2946 | 2946 | $redirectSuppressed = false; |
| 2947 | 2947 | } else { |
| 2948 | 2948 | $this->resetArticleID( 0 ); |
| — | — | @@ -2970,7 +2970,7 @@ |
| 2971 | 2971 | */ |
| 2972 | 2972 | private function moveToNewTitle( &$nt, $reason = '', $createRedirect = true ) { |
| 2973 | 2973 | global $wgUseSquid, $wgUser; |
| 2974 | | - $fname = 'MovePageForm::moveToNewTitle'; |
| | 2974 | + |
| 2975 | 2975 | $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() ); |
| 2976 | 2976 | if ( $reason ) { |
| 2977 | 2977 | $comment .= wfMsgExt( 'colon-separator', |
| — | — | @@ -3004,7 +3004,7 @@ |
| 3005 | 3005 | 'page_latest' => $nullRevId, |
| 3006 | 3006 | ), |
| 3007 | 3007 | /* WHERE */ array( 'page_id' => $oldid ), |
| 3008 | | - $fname |
| | 3008 | + __METHOD__ |
| 3009 | 3009 | ); |
| 3010 | 3010 | $nt->resetArticleID( $oldid ); |
| 3011 | 3011 | |
| — | — | @@ -3029,7 +3029,7 @@ |
| 3030 | 3030 | 'pl_from' => $newid, |
| 3031 | 3031 | 'pl_namespace' => $nt->getNamespace(), |
| 3032 | 3032 | 'pl_title' => $nt->getDBkey() ), |
| 3033 | | - $fname ); |
| | 3033 | + __METHOD__ ); |
| 3034 | 3034 | $redirectSuppressed = false; |
| 3035 | 3035 | } else { |
| 3036 | 3036 | $this->resetArticleID( 0 ); |