From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 9 Jun 2008 14:17:16 +0000 (+0000)
Subject: (bug 11951) EditPage::getEditToolbar() is now static. Should make life easier for... 
X-Git-Tag: 1.31.0-rc.0~47102
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=5c13aa6303d771a7139a2ef432b44d945dacbddf;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index eb850c0156..f0c74ed2e8 100644
--- 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 80c44717f2..48203d1518 100644
--- 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;
 
 		/**