From: Antoine Musso <hashar@users.mediawiki.org>
Date: Mon, 10 Jul 2006 15:08:51 +0000 (+0000)
Subject: static E_STRICT warnings
X-Git-Tag: 1.31.0-rc.0~56326
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=c4cbef35ec0d4ff4e2de7bb09ad5957291d9bb94;p=lhc%2Fweb%2Fwiklou.git

static E_STRICT warnings
---

diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php
index f985a7b447..314169153b 100644
--- a/includes/LoadBalancer.php
+++ b/includes/LoadBalancer.php
@@ -50,7 +50,7 @@ class LoadBalancer {
 		$this->mAllowLag = false;
 	}
 
-	function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 )
+	static function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 )
 	{
 		$lb = new LoadBalancer;
 		$lb->initialise( $servers, $failFunction, $waitTimeout );
diff --git a/includes/Parser.php b/includes/Parser.php
index 31976baf23..cfe6f1c5cb 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -4556,7 +4556,7 @@ class ParserOptions
 	 * Get parser options
 	 * @static
 	 */
-	function newFromUser( &$user ) {
+	static function newFromUser( &$user ) {
 		return new ParserOptions( $user );
 	}
 
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 234531e471..7caefc69a7 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -920,8 +920,9 @@ class Sanitizer {
 	 * @param string $text
 	 * @return string
 	 * @public
+	 * @static
 	 */
-	function decodeCharReferences( $text ) {
+	public static function decodeCharReferences( $text ) {
 		return preg_replace_callback(
 			MW_CHAR_REFS_REGEX,
 			array( 'Sanitizer', 'decodeCharReferencesCallback' ),
@@ -932,7 +933,7 @@ class Sanitizer {
 	 * @param string $matches
 	 * @return string
 	 */
-	function decodeCharReferencesCallback( $matches ) {
+	static function decodeCharReferencesCallback( $matches ) {
 		if( $matches[1] != '' ) {
 			return Sanitizer::decodeEntity( $matches[1] );
 		} elseif( $matches[2] != '' ) {
diff --git a/includes/Title.php b/includes/Title.php
index bc8f69a2b2..1a9df34d59 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -108,7 +108,7 @@ class Title {
 	 * @static
 	 * @access public
 	 */
-	function newFromText( $text, $defaultNamespace = NS_MAIN ) {
+	public static function newFromText( $text, $defaultNamespace = NS_MAIN ) {
 		$fname = 'Title::newFromText';
 
 		if( is_object( $text ) ) {
@@ -233,7 +233,7 @@ class Title {
 	 * @static
 	 * @access public
 	 */
-	function &makeTitle( $ns, $title ) {
+	public static function &makeTitle( $ns, $title ) {
 		$t =& new Title();
 		$t->mInterwiki = '';
 		$t->mFragment = '';