// Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7853 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-02 14:24:28 +00:00
parent 26efd329a3
commit 6fc10e23f8
30 changed files with 39 additions and 40 deletions
+1 -1
View File
@@ -1192,7 +1192,7 @@ abstract class AdminTabCore
$this->_group .= ', a.'.pSQL($this->identifier);
$filterShop = 'JOIN `'._DB_PREFIX_.$this->table.'_'.$filterKey.'` sa ON (sa.'.$this->identifier.' = a.'.$this->identifier.' AND sa.id_'.$filterKey.' IN ('.implode(', ', $idenfierShop).'))';
}
/* Query in order to get results with all fields */
$sql = 'SELECT SQL_CALC_FOUND_ROWS
'.($this->_tmpTableFilter ? ' * FROM (SELECT ' : '').'