Merge pull request #70 from AmyStephen/master

PHP Strict Errors
joomla · Jul 4, 2011 · eef45b2 · eef45b2
2 parents c6d66ef + 43ca201
commit eef45b2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/libraries/joomla/html/toolbar/button.php b/libraries/joomla/html/toolbar/button.php
@@ -90,18 +90,6 @@ public function fetchIconClass($identifier)
 		return "icon-32-$identifier";
 	}
 
-	/**
-	 * Get the button id
-	 *
-	 * Can be redefined in the final button class
-	 *
-	 * @since       11.1
-	 */
-	public function fetchId()
-	{
-		return;
-	}
-
 	/**
 	 * Get the button
 	 *

diff --git a/libraries/joomla/utilities/date.php b/libraries/joomla/utilities/date.php
@@ -411,7 +411,7 @@ public function setOffset($offset)
 	 *
 	 * @since   11.1
 	 */
-	public function setTimezone(DateTimeZone $tz)
+	public function setTimezone($tz)
 	{
 		$this->_tz = $tz;
 		return parent::setTimezone($tz);