dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminTranslations.php
+3 -3
View File
@@ -157,7 +157,7 @@ class AdminTranslations extends AdminTab
}
}
if ($bool)
Tools::redirectLink(self::$currentIndex.'&conf=14&token='.$this->token);
Tools::redirectAdmin(self::$currentIndex.'&conf=14&token='.$this->token);
$this->_errors[] = $this->l('a part of the data has been copied but some language files could not be found or copied');
}
@@ -1715,7 +1715,7 @@ class AdminTranslations extends AdminTab
{
if ($module{0} != '.' AND is_dir($root_dir.$module))
{
@include_once($root_dir.$module.'/'.$lang.'.php');
@include($root_dir.$module.'/'.$lang.'.php');
self::getModuleTranslations($is_default);
$this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $root_dir.$module.'/'.$lang.'.php', $is_default);
}
@@ -1891,7 +1891,7 @@ class AdminTranslations extends AdminTab
*
* @return array
*/
static public function getThemesList()
public static function getThemesList()
{
$dir = opendir(_PS_ALL_THEMES_DIR_);
while ($folder = readdir($dir))