// Merge -> revision 8014

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-11 12:00:05 +00:00
parent d1d4d57eca
commit 52d1d13891
137 changed files with 717 additions and 369 deletions
+7 -1
View File
@@ -93,7 +93,6 @@ class AdminLanguages extends AdminTab
}
unlink($tmpName);
}
}
/**
@@ -122,6 +121,13 @@ class AdminLanguages extends AdminTab
return !sizeof($this->_errors) ? true : false;
}
protected function copyFromPost(&$object, $table)
{
if($object->id AND ($object->iso_code != $_POST['iso_code']))
if(Validate::isLanguageIsoCode($_POST['iso_code']))
$object->moveToIso($_POST['iso_code']);
parent::copyFromPost($object, $table);
}
public function postProcess()
{