Merge "Rewrite pref cleanup script"

[lhc/web/wiklou.git] / includes / content / ContentHandler.php

diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index a7b97a5..edfc81c 100644 (file)
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -799,13 +799,13 @@ abstract class ContentHandler {
                }
 
                // New page created
-               if ( $flags & EDIT_NEW && $newContent && $newContent->getSize() > 0 ) {
-                       return 'newpage';
-               }
-
-               // New blank page
-               if ( $flags & EDIT_NEW && $newContent && $newContent->getSize() === 0 ) {
-                       return 'newblank';
+               if ( $flags & EDIT_NEW && $newContent ) {
+                       if ( $newContent->getSize() === 0 ) {
+                               // New blank page
+                               return 'newblank';
+                       } else {
+                               return 'newpage';
+                       }
                }
 
                // Removing more than 90% of the page
@@ -855,7 +855,7 @@ abstract class ContentHandler {
                                );
 
                                return wfMessage( 'autoredircomment', $newTarget->getFullText() )
-                                       ->rawParams( $truncatedtext )->inContentLanguage()->text();
+                                       ->plaintextParams( $truncatedtext )->inContentLanguage()->text();
                        case 'changed-redirect-target':
                                $oldTarget = $oldContent->getRedirectTarget();
                                $newTarget = $newContent->getRedirectTarget();