Merge pull request #119 from wdammak/patch-15

PHP 7.x AdminController.php

Author: rohit053

classes/controller/AdminController.php

@@ -3307,7 +3307,7 @@ public function getModulesList($filter_modules_list)
             $filter_modules_list = array($filter_modules_list);
         }
 
-        if (is_null($filter_modules_list) || !count($filter_modules_list)) {
+        if (is_null($filter_modules_list) || empty($filter_modules_list)) {
             return false;
         } //if there is no modules to display just return false;
 
@@ -3500,9 +3500,9 @@ public function validateRules($class_name = false)
                 foreach ($languages as $language) {
                     if (($value = Tools::getValue($field_lang.'_'.$language['id_lang'])) !== false && !empty($value)) {
                         if (Tools::strtolower($function) == 'iscleanhtml' && Configuration::get('PS_ALLOW_HTML_IFRAME')) {
-                            $res = Validate::$function($value, true);
+                            $res = Validate::{$function}($value, true);
                         } else {
-                            $res = Validate::$function($value);
+                            $res = Validate::{$function}($value);
                         }
                         if (!$res) {
                             $this->errors[$field_lang.'_'.$language['id_lang']] = sprintf(