// fix added toolbar in AdminTranslationsController

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10444 b9a71923-0436-4b27-9f14-aed3839534dd

classes/AdminController.php

@@ -1371,12 +1371,12 @@ class AdminControllerCore extends Controller
 	/**
 	 * Override to init display of the view page
 	 */
-	public function initView()
+	public function initView($tpl = false)
 	{
 		$helper = new HelperView($this);
 		$this->setHelperDisplay($helper);
 		$helper->tpl_vars = $this->tpl_view_vars;
-		$view = $helper->generateView();
+		$view = $helper->generateView($tpl);
 		$this->toolbar_fix = false;
 
 		return $view;

classes/HelperView.php

@@ -42,9 +42,9 @@ class HelperViewCore extends Helper
 		parent::__construct();
 	}
 
-	public function generateView()
+	public function generateView($tpl = false)
 	{
-		$this->tpl = $this->createTemplate($this->base_tpl);
+		$this->tpl = $this->createTemplate(!$tpl ? $this->base_tpl : $tpl);
 
 		$this->tpl->assign(array(
 			'title' => $this->title,