v1.2.0 Released

This commit is contained in:
Rohit
2018-09-25 21:15:24 +05:30
parent a739332b50
commit 37ce9bd597
1887 changed files with 25972 additions and 139770 deletions

View File

@@ -498,9 +498,9 @@ class AdminControllerCore extends Controller
// Check if logged on Addons
$this->logged_on_addons = false;
if (isset($this->context->cookie->username_addons) && isset($this->context->cookie->password_addons) && !empty($this->context->cookie->username_addons) && !empty($this->context->cookie->password_addons)) {
$this->logged_on_addons = true;
}
// if (isset($this->context->cookie->username_addons) && isset($this->context->cookie->password_addons) && !empty($this->context->cookie->username_addons) && !empty($this->context->cookie->password_addons)) {
// $this->logged_on_addons = true;
// }
// Set context mode
if (defined('_PS_HOST_MODE_') && _PS_HOST_MODE_) {
@@ -1359,7 +1359,7 @@ class AdminControllerCore extends Controller
// Check if field is required
if ((!Shop::isFeatureActive() && isset($values['required']) && $values['required'])
|| (Shop::isFeatureActive() && isset($_POST['multishopOverrideOption'][$field]) && isset($values['required']) && $values['required'])) {
if (isset($values['type']) && $values['type'] == 'textLang') {
if (isset($values['type']) && in_array($values['type'], array('textLang', 'textareaLang'))) {
foreach ($languages as $language) {
if (($value = Tools::getValue($field.'_'.$language['id_lang'])) == false && (string)$value != '0') {
$this->errors[] = sprintf(Tools::displayError('field %s is required.'), $values['title']);
@@ -1371,7 +1371,7 @@ class AdminControllerCore extends Controller
}
// Check field validator
if (isset($values['type']) && $values['type'] == 'textLang') {
if (isset($values['type']) && in_array($values['type'], array('textLang', 'textareaLang'))) {
foreach ($languages as $language) {
if (Tools::getValue($field.'_'.$language['id_lang']) && isset($values['validation'])) {
if (!Validate::$values['validation'](Tools::getValue($field.'_'.$language['id_lang']))) {
@@ -1930,6 +1930,7 @@ class AdminControllerCore extends Controller
'iso_user' => $this->context->language->iso_code,
'country_iso_code' => $this->context->country->iso_code,
'version' => _PS_VERSION_,
'qloapps_version' => _QLOAPPS_VERSION_,
'lang_iso' => $this->context->language->iso_code,
'full_language_code' => $this->context->language->language_code,
'link' => $this->context->link,
@@ -2200,6 +2201,7 @@ class AdminControllerCore extends Controller
$this->context->smarty->assign(array(
'ps_version' => _PS_VERSION_,
'qloapps_version' => _QLOAPPS_VERSION_,
'timer_start' => $this->timer_start,
'iso_is_fr' => strtoupper($this->context->language->iso_code) == 'FR',
'modals' => $this->renderModal(),