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

// Fixed warning

Browse Source
This commit is contained in:
Damien Metzger
2013-04-23 11:36:13 +02:00
parent 4e21c56d1b
commit 13c435a54b
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+16 -5
View File
@@ -1194,10 +1194,7 @@ class AdminTranslationsControllerCore extends AdminController
// Get folder name of theme // Get folder name of theme
if (($theme = Tools::getValue('theme')) && !is_array($theme)) if (($theme = Tools::getValue('theme')) && !is_array($theme))
{ {
$theme_exists = false; $theme_exists = $this->theme_exists($theme);
foreach ($this->themes as $existing_theme)
if ($existing_theme->directory == $theme)
$theme_exists = true;
if (!$theme_exists) if (!$theme_exists)
throw new PrestaShopException(sprintf(Tools::displayError('Invalid theme "%s"'), $theme)); throw new PrestaShopException(sprintf(Tools::displayError('Invalid theme "%s"'), $theme));
$this->theme_selected = Tools::safeOutput($theme); $this->theme_selected = Tools::safeOutput($theme);
@@ -1593,6 +1590,9 @@ class AdminTranslationsControllerCore extends AdminController
*/ */
public function initFormFront() public function initFormFront()
{ {
if (!$this->theme_exists(Tools::getValue('theme')))
throw new PrestaShopException(sprintf(Tools::displayError('Invalid theme "%s"'), Tools::getValue('theme')));
$missing_translations_front = array(); $missing_translations_front = array();
$name_var = $this->translations_informations[$this->type_selected]['var']; $name_var = $this->translations_informations[$this->type_selected]['var'];
$GLOBALS[$name_var] = $this->fileExists(); $GLOBALS[$name_var] = $this->fileExists();
@@ -2733,5 +2733,16 @@ class AdminTranslationsControllerCore extends AdminController
} }
return $list; return $list;
} }
protected function theme_exists($theme)
{
if (!is_array($this->themes))
$this->themes = Theme::getThemes();
} $theme_exists = false;
foreach ($this->themes as $existing_theme)
if ($existing_theme->directory == $theme)
return true;
return false;
}
}