[*] BO : #PSFV-94 - added AdminSlipController

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9730 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 16:07:40 +00:00
parent 4e04df6d98
commit b230e4654d
5 changed files with 80 additions and 19 deletions
@@ -96,6 +96,9 @@ class AdminControllerCore extends Controller
 	/** @var integer Number of results in list */
 	protected $_listTotal = 0;

+	/** @var boolean Automatically join language table if true */
+	public $lang = false;
+
 	/** @var array WHERE clause determined by filter fields */
 	protected $_filter;

@@ -772,7 +775,7 @@ class AdminControllerCore extends Controller
 		if (!$this->checkToken())
 		{
 			// If this is an XSS attempt, then we should only display a simple, secure page
-			// ${1} in the replacement string of the regexp is required, 
+			// ${1} in the replacement string of the regexp is required,
 			// because the token may begin with a number and mix up with it (e.g. $17)
 			$url = preg_replace('/([&?]token=)[^&]*(&.*)?$/', '${1}'.$this->token.'$2', $_SERVER['REQUEST_URI']);
 			if (false === strpos($url, '?token=') && false === strpos($url, '&token='))
@@ -1084,13 +1087,14 @@ class AdminControllerCore extends Controller
 			'table' => $this->table,
 			'current' => self::$currentIndex,
 			'token' => $this->token,
-			'content' => $this->content
+			'content' => $this->content,
+			'url_post' => self::$currentIndex.'&token='.$this->token,
 		));
 	}

 	/**
 	 * initialize the invalid doom page of death
-	 * 
+	 *
 	 * @return void
 	 */
 	public function initCursedPage()