From 67358e6f9abf5284ee58bf57e9494760dea98679 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 16 Feb 2016 10:42:13 -0800 Subject: [PATCH] PHP notice removal. --- e107_handlers/admin_ui.php | 8 ++++---- e107_handlers/form_handler.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 18fb2d93b..71f2c82fb 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -3790,7 +3790,7 @@ class e_admin_controller_ui extends e_admin_controller // filter for WHERE and FROM clauses $searchable_types = array('text', 'textarea', 'bbarea', 'url', 'ip', 'tags', 'email', 'int', 'integer', 'str', 'string', 'number'); //method? 'user', - if($var['type'] == 'method' && ($var['data'] == 'string' || $var['data'] == 'str')) + if($var['type'] == 'method' && !empty($var['data']) && ($var['data'] == 'string' || $var['data'] == 'str')) { $searchable_types[] = 'method'; } @@ -5508,7 +5508,7 @@ class e_admin_ui extends e_admin_controller_ui continue; } - if($att['type'] == 'comma' && (!vartrue($att['data']) || !vartrue($att['rule']))) + if(varset($att['type']) == 'comma' && (empty($att['data']) || empty($att['rule']))) { $att['data'] = 'set'; $att['validate'] = 'set'; @@ -5524,7 +5524,7 @@ class e_admin_ui extends e_admin_controller_ui $att['data'] = 'set'; } - if(($key !== 'options' && false !== varset($att['data']) && null !== $att['type'] && !vartrue($att['noedit'])) || vartrue($att['forceSave'])) + if(($key !== 'options' && false !== varset($att['data']) && null !== varset($att['type']) && !vartrue($att['noedit'])) || vartrue($att['forceSave'])) { $this->dataFields[$key] = vartrue($att['data'], 'str'); } @@ -5540,7 +5540,7 @@ class e_admin_ui extends e_admin_controller_ui $this->validationRules = array(); foreach ($this->fields as $key => $att) { - if(null === $att['type'] || vartrue($att['noedit'])) + if(null === varset($att['type']) || vartrue($att['noedit'])) { continue; } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index d37e5966a..b7dbaea73 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -3839,7 +3839,7 @@ class e_form $method = $attributes['field']; // prevents table alias in method names. ie. u.my_method. $_value = $value; - if($attributes['data'] == 'array') // FIXME @SecretR - please move this to where it should be. + if(!empty($attributes['data']) && $attributes['data'] == 'array') // FIXME @SecretR - please move this to where it should be. { $value = e107::unserialize($value); // (saved as array, return it as an array) }