diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index 52987c331..07798fb5f 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -694,6 +694,7 @@ e107::js('footer-inline', js()); // Get list of current extended fields $curList = $ue->user_extended_get_fieldlist(); + $curNames = array(); foreach($curList as $c) { $curNames[] = $c['user_extended_struct_name']; @@ -728,7 +729,7 @@ e107::js('footer-inline', js()); foreach($preList as $k=>$a) { - if($k !='version') // don't know why this is appearing in the array. + if($k !== 'version') // don't know why this is appearing in the array. { $active = (in_array($a['name'], $curNames)) ? TRUE : FALSE; $txt .= $this->show_predefined_field($a,$active); diff --git a/e107_handlers/validator_class.php b/e107_handlers/validator_class.php index 71548c311..1f469589d 100644 --- a/e107_handlers/validator_class.php +++ b/e107_handlers/validator_class.php @@ -988,7 +988,9 @@ class validatorClass // ...one and aren't otherwise defined. public static function validateFields(&$sourceFields, &$definitions, $addDefaults = FALSE) { - global $tp, $pref; + $tp = e107::getParser(); + $pref = e107::getPref(); + $ret = array('data' => array(), 'failed' => array(), 'errors' => array()); foreach ($definitions as $dest => $defs) diff --git a/e107_tests/tests/acceptance/0002_UserSignupCest.php b/e107_tests/tests/acceptance/0002_UserSignupCest.php index c9473f186..d75e53afe 100644 --- a/e107_tests/tests/acceptance/0002_UserSignupCest.php +++ b/e107_tests/tests/acceptance/0002_UserSignupCest.php @@ -44,6 +44,7 @@ class UserSignupCest $I->click('register'); $I->dontSee('Unauthorized access!'); + $I->dontSee('Error'); } diff --git a/install.php b/install.php index 4dac21182..30db3a577 100644 --- a/install.php +++ b/install.php @@ -44,7 +44,7 @@ unset($e_ROOT); class installLog { - const logFile = "e107InstallLog.log"; + const logFile = "e107Install.log"; static function exceptionHandler(Exception $exception) @@ -53,7 +53,7 @@ class installLog self::add($message, "error"); } - static function errorHandler($errno, $errstr, $errfile, $errline) + static function errorHandler($errno=null, $errstr=null, $errfile=null, $errline=null) { $error = "Error on line $errline in file ".$errfile." : ".$errstr; @@ -143,7 +143,7 @@ define("e_UC_NOBODY", 255);*/ define("E107_INSTALL",true); -if($_SERVER['QUERY_STRING'] !== "debug") +if($_SERVER['QUERY_STRING'] !== "debug") // install.php?debug { error_reporting(0); // suppress all errors unless debugging. } @@ -159,13 +159,13 @@ if($_SERVER['QUERY_STRING'] === 'clear') //error_reporting(E_ALL); -function e107_ini_set($var, $value) +/*function e107_ini_set($var, $value) { if (function_exists('ini_set')) { ini_set($var, $value); } -} +}*/ // setup some php options @@ -198,7 +198,7 @@ if($inc_path[0] !== ".") { array_unshift($inc_path, "."); $inc_path = implode(PATH_SEPARATOR, $inc_path); - e107_ini_set("include_path", $inc_path); + ini_set("include_path", $inc_path); } unset($inc_path); @@ -276,7 +276,7 @@ if($e107->initInstall($e107_paths, $ebase, $override)===false) { die_fatal_error("Error creating the following empty file: ".$ebase.DIRECTORY_SEPARATOR."e107_config.php
Please create it manually and then run the installation again."); } - + unset($e107_paths,$override,$ebase); // NEW - session handler @@ -2529,7 +2529,7 @@ function template_data() */ function die_fatal_error($error) { - + define("e_IMAGE","e107_images/"); define("e_JS","e107_web/js/"); define("e_THEME", "e107_themes/");