* (bug 4214) Skip redundant action text inserts into the HTML <title>

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1dad42f..79c174a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -304,6 +304,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 4201) Fix user-talk mode for Enotif, and general code cleanup
 * (bug 4207) Wrong image size when using 100x200px syntax to scale image up
   patch by David Benbennick
+* (bug 4214) Skip redundant action text inserts into the HTML <title>
 
 
 === Caveats ===

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index bf5d17a..56f0aa3 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -142,20 +142,17 @@ class OutputPage {
                global $action;
                switch($action) {
                        case 'edit':
-                               return wfMsg('edit');
-                       case 'history':
-                               return wfMsg('history_short');
+                       case 'delete':
                        case 'protect':
-                               return wfMsg('protect');
                        case 'unprotect':
-                               return wfMsg('unprotect');
-                       case 'delete':
-                               return wfMsg('delete');
                        case 'watch':
-                               return wfMsg('watch');
                        case 'unwatch':
-                               return wfMsg('unwatch');
+                               // Display title is already customized
+                               return '';
+                       case 'history':
+                               return wfMsg('history_short');
                        case 'submit':
+                               // FIXME: bug 2735; not correct for special pages etc
                                return wfMsg('preview');
                        case 'info':
                                return wfMsg('info_short');