Skip to content
Permalink
Browse files

#3328

  • Loading branch information...
danielkerr committed Sep 11, 2015
1 parent 81c46c4 commit 2ca2db5c1851fe81940b307c0367b1a4498eec14
@@ -314,7 +314,7 @@ public function index() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', (array)$this->config->get('config_captcha_page'))) {
$data['captcha'] = $this->load->controller('captcha/' . $this->config->get('config_captcha'), $this->error);
} else {
$data['captcha'] = '';
@@ -426,7 +426,7 @@ private function validate() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', (array)$this->config->get('config_captcha_page'))) {
$captcha = $this->load->controller('captcha/' . $this->config->get('config_captcha') . '/validate');
if ($captcha) {
@@ -511,7 +511,7 @@ public function add() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('return', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('return', (array)$this->config->get('config_captcha_page'))) {
$data['captcha'] = $this->load->controller('captcha/' . $this->config->get('config_captcha'), $this->error);
} else {
$data['captcha'] = '';
@@ -586,7 +586,7 @@ protected function validate() {
$this->error['reason'] = $this->language->get('error_reason');
}
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('return', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('return', (array)$this->config->get('config_captcha_page'))) {
$captcha = $this->load->controller('captcha/' . $this->config->get('config_captcha') . '/validate');
if ($captcha) {
@@ -316,7 +316,7 @@ public function index() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', (array)$this->config->get('config_captcha_page'))) {
$data['captcha'] = $this->load->controller('captcha/' . $this->config->get('config_captcha'), $this->error);
} else {
$data['captcha'] = '';
@@ -410,7 +410,7 @@ protected function validate() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', (array)$this->config->get('config_captcha_page'))) {
$captcha = $this->load->controller('captcha/' . $this->config->get('config_captcha') . '/validate');
if ($captcha) {
@@ -162,7 +162,7 @@ public function index() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', (array)$this->config->get('config_captcha_page'))) {
$data['captcha'] = $this->load->controller('captcha/' . $this->config->get('config_captcha'));
} else {
$data['captcha'] = '';
@@ -255,7 +255,7 @@ public function save() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', (array)$this->config->get('config_captcha_page'))) {
$captcha = $this->load->controller('captcha/' . $this->config->get('config_captcha') . '/validate');
if ($captcha) {
@@ -76,7 +76,7 @@ public function index() {
$data['custom_fields'] = $this->model_account_custom_field->getCustomFields();
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', (array)$this->config->get('config_captcha_page'))) {
$data['captcha'] = $this->load->controller('captcha/' . $this->config->get('config_captcha'));
} else {
$data['captcha'] = '';
@@ -223,7 +223,7 @@ public function save() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('register', (array)$this->config->get('config_captcha_page'))) {
$captcha = $this->load->controller('captcha/' . $this->config->get('config_captcha') . '/validate');
if ($captcha) {
@@ -142,7 +142,7 @@ public function index() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('contact', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('contact', (array)$this->config->get('config_captcha_page'))) {
$data['captcha'] = $this->load->controller('captcha/' . $this->config->get('config_captcha'), $this->error);
} else {
$data['captcha'] = '';
@@ -176,7 +176,7 @@ protected function validate() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('contact', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('contact', (array)$this->config->get('config_captcha_page'))) {
$captcha = $this->load->controller('captcha/' . $this->config->get('config_captcha') . '/validate');
if ($captcha) {
@@ -392,7 +392,7 @@ public function index() {
$data['rating'] = (int)$product_info['rating'];
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('review', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('review', (array)$this->config->get('config_captcha_page'))) {
$data['captcha'] = $this->load->controller('captcha/' . $this->config->get('config_captcha'));
} else {
$data['captcha'] = '';
@@ -625,7 +625,7 @@ public function write() {
}
// Captcha
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('review', $this->config->get('config_captcha_page'))) {
if ($this->config->get($this->config->get('config_captcha') . '_status') && in_array('review', (array)$this->config->get('config_captcha_page'))) {
$captcha = $this->load->controller('captcha/' . $this->config->get('config_captcha') . '/validate');
if ($captcha) {
@@ -358,7 +358,7 @@ public function mysql() {
if ($result['serialized'] && preg_match('/^(a:)/', $result['value'])) {
$value = unserialize($result['value']);
$this->db->query("UPDATE `" . DB_PREFIX . "setting` SET `value` = '" . $this->db->escape(json_encode($value)) . "' WHERE `key` = '" . $this->db->escape($result['key']) . "' AND `code` = '" . $this->db->escape($result['code']) . "' AND `store_id` = '" . (int)$result['store_id'] . "'");
$this->db->query("UPDATE `" . DB_PREFIX . "setting` SET `value` = '" . $this->db->escape(json_encode($value)) . "' WHERE `setting_id` = '" . (int)$result['setting_id'] . "'");
}
}

0 comments on commit 2ca2db5

Please sign in to comment.
You can’t perform that action at this time.