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

2013-10-02 17:50:50 +02:00
parent 2a984186a9 19af1cfda5
commit c88ea275ab
4 changed files with 28 additions and 13 deletions
@@ -1861,6 +1861,7 @@ class AdminControllerCore extends Controller
 		$helper->position_identifier = $this->position_identifier;
 		$helper->controller_name = $this->controller_name;
 		$helper->list_id = isset($this->list_id) ? $this->list_id : $this->table;
+		$helper->bootstrap = $this->bootstrap;

 		// For each action, try to add the corresponding skip elements list
 		$helper->list_skip_actions = $this->list_skip_actions;