(bug 11951) EditPage::getEditToolbar() is now static. Should make life easier for...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index eb850c0..f0c74ed 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -349,6 +349,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   and $2 (=revision numbers)
 * (bug 14401) Fix Safari access key tooltips for Windows and >3.1 Mac versions
 * (bug 14432) Fix notice regression in Special:Newpages feed mode
+* (bug 11951) EditPage::getEditToolbar() is now static.
 
 
 === API changes in 1.13 ===

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 80c4471..48203d1 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1205,7 +1205,7 @@ class EditPage {
 
                if( $wgUser->getOption('showtoolbar') and !$this->isCssJsSubpage ) {
                        # prepare toolbar for edit buttons
-                       $toolbar = $this->getEditToolbar();
+                       $toolbar = EditPage::getEditToolbar();
                } else {
                        $toolbar = '';
                }
@@ -1791,8 +1791,10 @@ END
         * Shows a bulletin board style toolbar for common editing functions.
         * It can be disabled in the user preferences.
         * The necessary JavaScript code can be found in style/wikibits.js.
+        * 
+        * @return string
         */
-       function getEditToolbar() {
+       static function getEditToolbar() {
                global $wgStylePath, $wgContLang, $wgJsMimeType;
 
                /**