Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-09-13 11:41:26 +02:00
parent c7ec33f062 f20fa55308
commit 968f2a45d5
6 changed files with 193 additions and 14 deletions
@@ -329,7 +329,8 @@ class TreeCore
 				$this->getTemplateFile($this->getHeaderTemplate()),
 				$this->getContext()->smarty
 			);
-			$headerTemplate->assign(array(
+			$headerTemplate->assign($this->getAttributes())
+				->assign(array(
 				'title'   => $this->getTitle(),
 				'toolbar' => $this->useToolbar() ? $this->renderToolbar() : null
 			));
@@ -337,9 +338,8 @@ class TreeCore
 		}
 		
 		//Assign Tree nodes
-		$template
-		->assign($this->getAttributes())
-		->assign(array(
+		$template->assign($this->getAttributes())
+			->assign(array(
 			'id'    => $this->getId(),
 			'nodes' => $this->renderNodes($data)
 		));