From: Reedy <reedy@wikimedia.org>
Date: Thu, 21 Jun 2012 21:56:12 +0000 (+0100)
Subject: Fix undefined property domain in AuthPlugin
X-Git-Tag: 1.31.0-rc.0~23265
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=a97f6b035c951e16c385ca85169fd7d7578f2af8;p=lhc%2Fweb%2Fwiklou.git

Fix undefined property domain in AuthPlugin

[21-Jun-2012 20:35:17] PHP Notice:  Undefined property: AuthPlugin::$domain in /www/w/includes/AuthPlugin.php on line 92

Change-Id: I0c470b41881e0fd12d9615f7ac258feeff1a52e4
---

diff --git a/includes/AuthPlugin.php b/includes/AuthPlugin.php
index 9cdd4f345d..c7fcf93f3c 100644
--- a/includes/AuthPlugin.php
+++ b/includes/AuthPlugin.php
@@ -34,6 +34,12 @@
  * someone logs in who can be authenticated externally.
  */
 class AuthPlugin {
+
+	/**
+	 * @var string
+	 */
+	protected $domain;
+
 	/**
 	 * Check whether there exists a user account with the given name.
 	 * The name will be normalized to MediaWiki's requirements, so
@@ -89,7 +95,7 @@ class AuthPlugin {
 	 * @return string
 	 */
 	public function getDomain() {
-		if ( $this->domain ) {
+		if ( isset( $this->domain ) ) {
 			return $this->domain;
 		} else {
 			return 'invaliddomain';