Merge pull request joomla#710 from beat/patch-1

Fixing bug introduced in the fix joomla@a962ad7
vinset · Jan 6, 2012 · 07401c3 · 07401c3
2 parents 8158c1c + 5090a09
commit 07401c3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libraries/joomla/application/component/helper.php b/libraries/joomla/application/component/helper.php
@@ -357,7 +357,8 @@ public static function renderComponent($option, $params = array())
 		$contents = self::executeComponent($path);
 
 		// Build the component toolbar
-		if ($path = JApplicationHelper::getPath('toolbar') && $app->isAdmin())
+		$path = JApplicationHelper::getPath('toolbar');
+		if ($path && $app->isAdmin())
 		{
 			// Get the task again, in case it has changed
 			$task = JRequest::getString('task');