| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1923,6 +1923,7 @@ |
| 1924 | 1924 | 'movepage-max-pages', |
| 1925 | 1925 | '1movedto2', |
| 1926 | 1926 | '1movedto2_redir', |
| | 1927 | + 'move-redirect-suppressed', |
| 1927 | 1928 | 'movelogpage', |
| 1928 | 1929 | 'movelogpagetext', |
| 1929 | 1930 | 'movereason', |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -2691,10 +2691,12 @@ |
| 2692 | 2692 | 'pl_namespace' => $nt->getNamespace(), |
| 2693 | 2693 | 'pl_title' => $nt->getDBkey() ), |
| 2694 | 2694 | $fname ); |
| | 2695 | + $redirectSuppressed = false; |
| 2695 | 2696 | } else { |
| 2696 | 2697 | $this->resetArticleID( 0 ); |
| | 2698 | + $redirectSuppressed = true; |
| 2697 | 2699 | } |
| 2698 | | - |
| | 2700 | + |
| 2699 | 2701 | # Move an image if this is a file |
| 2700 | 2702 | if( $this->getNamespace() == NS_FILE ) { |
| 2701 | 2703 | $file = wfLocalFile( $this ); |
| — | — | @@ -2709,7 +2711,7 @@ |
| 2710 | 2712 | |
| 2711 | 2713 | # Log the move |
| 2712 | 2714 | $log = new LogPage( 'move' ); |
| 2713 | | - $log->addEntry( 'move_redir', $this, $reason, array( 1 => $nt->getPrefixedText() ) ); |
| | 2715 | + $log->addEntry( 'move_redir', $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) ); |
| 2714 | 2716 | |
| 2715 | 2717 | # Purge squid |
| 2716 | 2718 | if ( $wgUseSquid ) { |
| — | — | @@ -2786,10 +2788,12 @@ |
| 2787 | 2789 | 'pl_namespace' => $nt->getNamespace(), |
| 2788 | 2790 | 'pl_title' => $nt->getDBkey() ), |
| 2789 | 2791 | $fname ); |
| | 2792 | + $redirectSuppressed = false; |
| 2790 | 2793 | } else { |
| 2791 | 2794 | $this->resetArticleID( 0 ); |
| | 2795 | + $redirectSuppressed = true; |
| 2792 | 2796 | } |
| 2793 | | - |
| | 2797 | + |
| 2794 | 2798 | # Move an image if this is a file |
| 2795 | 2799 | if( $this->getNamespace() == NS_FILE ) { |
| 2796 | 2800 | $file = wfLocalFile( $this ); |
| — | — | @@ -2804,7 +2808,7 @@ |
| 2805 | 2809 | |
| 2806 | 2810 | # Log the move |
| 2807 | 2811 | $log = new LogPage( 'move' ); |
| 2808 | | - $log->addEntry( 'move', $this, $reason, array( 1 => $nt->getPrefixedText()) ); |
| | 2812 | + $log->addEntry( 'move', $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) ); |
| 2809 | 2813 | |
| 2810 | 2814 | # Purge caches as per article creation |
| 2811 | 2815 | Article::onArticleCreate( $nt ); |
| Index: trunk/phase3/includes/LogPage.php |
| — | — | @@ -210,6 +210,10 @@ |
| 211 | 211 | if( $params[2] ) { |
| 212 | 212 | $details .= ' ['.wfMsg('protect-summary-cascade').']'; |
| 213 | 213 | } |
| | 214 | + } else if ( $type == 'move' && count( $params ) == 3 ) { |
| | 215 | + if( $params[2] ) { |
| | 216 | + $details .= ' [' . wfMsg( 'move-redirect-suppressed' ) . ']'; |
| | 217 | + } |
| 214 | 218 | } |
| 215 | 219 | $rv = wfMsgReal( $wgLogActions[$key], $params, true, !$skin ) . $details; |
| 216 | 220 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2753,6 +2753,7 @@ |
| 2754 | 2754 | 'movepage-max-pages' => 'The maximum of $1 {{PLURAL:$1|page|pages}} has been moved and no more will be moved automatically.', |
| 2755 | 2755 | '1movedto2' => '[[$1]] moved to [[$2]]', |
| 2756 | 2756 | '1movedto2_redir' => '[[$1]] moved to [[$2]] over redirect', |
| | 2757 | +'move-redirect-suppressed' => 'redirect suppressed', |
| 2757 | 2758 | 'movelogpage' => 'Move log', |
| 2758 | 2759 | 'movelogpagetext' => 'Below is a list of pages moved.', |
| 2759 | 2760 | 'movereason' => 'Reason:', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -255,6 +255,8 @@ |
| 256 | 256 | |- class="unsortable" |
| 257 | 257 | * (bug 16617) Add "talk" link to list of templates in edit mode |
| 258 | 258 | * Show subversion too even if a "normal" version number is available |
| | 259 | +* (bug 16121) Add a note that a page move was without creating a redirect in the |
| | 260 | + move log |
| 259 | 261 | |
| 260 | 262 | === Bug fixes in 1.14 === |
| 261 | 263 | |