Removed support for integer argument which matched client_id as discu…

…ssed with @mbabker, thanks.
joomla · Jan 25, 2016 · 84163c5 · 84163c5
1 parent f19c140
commit 84163c5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
@@ -669,7 +669,7 @@ protected function initialiseApp($options = array())
 	 * @return  boolean  True if this application is administrator.
 	 *
 	 * @since   3.2
-	 * @deprecated  Use isClient('administrator') or isClient(1) instead.
+	 * @deprecated  Use isClient('administrator') instead.
 	 */
 	public function isAdmin()
 	{
@@ -682,7 +682,7 @@ public function isAdmin()
 	 * @return  boolean  True if this application is site.
 	 *
 	 * @since   3.2
-	 * @deprecated  Use isClient('site') or isClient(0) instead.
+	 * @deprecated  Use isClient('site') instead.
 	 */
 	public function isSite()
 	{
@@ -700,9 +700,7 @@ public function isSite()
 	 */
 	public function isClient($identifier)
 	{
-		$match = is_numeric($identifier) ? $this->getClientId() : $this->getName();
-
-		return isset($match) && $match == $identifier;
+		return $this->getName() == $identifier;
 	}
 
 	/**

diff --git a/libraries/legacy/application/application.php b/libraries/legacy/application/application.php
@@ -1123,7 +1123,7 @@ public function getClientId()
 	 * @return  boolean  True if this application is administrator.
 	 *
 	 * @since   11.1
-	 * @deprecated  4.0  Use isClient('administrator') or isClient(1) instead.
+	 * @deprecated  4.0  Use isClient('administrator') instead.
 	 */
 	public function isAdmin()
 	{
@@ -1136,7 +1136,7 @@ public function isAdmin()
 	 * @return  boolean  True if this application is site.
 	 *
 	 * @since   11.1
-	 * @deprecated  4.0  Use isClient('site') or isClient(0) instead.
+	 * @deprecated  4.0  Use isClient('site') instead.
 	 */
 	public function isSite()
 	{
@@ -1154,9 +1154,7 @@ public function isSite()
 	 */
 	public function isClient($identifier)
 	{
-		$match = is_numeric($identifier) ? $this->getClientId() : $this->getName();
-
-		return isset($match) && $match == $identifier;
+		return $this->getName() == $identifier;
 	}
 
 	/**

diff --git a/tests/unit/suites/libraries/cms/application/JApplicationAdministratorTest.php b/tests/unit/suites/libraries/cms/application/JApplicationAdministratorTest.php
@@ -262,10 +262,7 @@ public function testIsSite()
 	public function testIsClient()
 	{
 		$this->assertTrue($this->class->isClient('administrator'));
-		$this->assertTrue($this->class->isClient(1));
-
 		$this->assertFalse($this->class->isClient('site'));
-		$this->assertFalse($this->class->isClient(0));
 	}
 
 	/**

diff --git a/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php b/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
@@ -373,10 +373,7 @@ public function testIsSite()
 	public function testIsClient()
 	{
 		$this->assertFalse($this->class->isClient('administrator'));
-		$this->assertFalse($this->class->isClient(1));
-
 		$this->assertFalse($this->class->isClient('site'));
-		$this->assertFalse($this->class->isClient(0));
 	}
 
 	/**

diff --git a/tests/unit/suites/libraries/cms/application/JApplicationSiteTest.php b/tests/unit/suites/libraries/cms/application/JApplicationSiteTest.php
@@ -280,10 +280,7 @@ public function testIsSite()
 	public function testIsClient()
 	{
 		$this->assertFalse($this->class->isClient('administrator'));
-		$this->assertFalse($this->class->isClient(1));
-
 		$this->assertTrue($this->class->isClient('site'));
-		$this->assertTrue($this->class->isClient(0));
 	}
 
 	/**