mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Installation fix.

Browse Source
This commit is contained in:
Cameron
2020-12-26 08:02:34 -08:00
parent c0736df559
commit 7989ebfc72
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/users_extended.php
View File

@@ -694,6 +694,7 @@ e107::js('footer-inline', js());
// Get list of current extended fields // Get list of current extended fields
$curList = $ue->user_extended_get_fieldlist(); $curList = $ue->user_extended_get_fieldlist();
$curNames = array();
foreach($curList as $c) foreach($curList as $c)
{ {
$curNames[] = $c['user_extended_struct_name']; $curNames[] = $c['user_extended_struct_name'];
@@ -728,7 +729,7 @@ e107::js('footer-inline', js());
foreach($preList as $k=>$a) 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; $active = (in_array($a['name'], $curNames)) ? TRUE : FALSE;
$txt .= $this->show_predefined_field($a,$active); $txt .= $this->show_predefined_field($a,$active);

4
e107_handlers/validator_class.php
View File

@@ -988,7 +988,9 @@ class validatorClass
// ...one and aren't otherwise defined. // ...one and aren't otherwise defined.
public static function validateFields(&$sourceFields, &$definitions, $addDefaults = FALSE) 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()); $ret = array('data' => array(), 'failed' => array(), 'errors' => array());
foreach ($definitions as $dest => $defs) foreach ($definitions as $dest => $defs)

1
e107_tests/tests/acceptance/0002_UserSignupCest.php
View File

@@ -44,6 +44,7 @@ class UserSignupCest
$I->click('register'); $I->click('register');
$I->dontSee('Unauthorized access!'); $I->dontSee('Unauthorized access!');
$I->dontSee('Error');
} }

12
install.php
View File

@@ -44,7 +44,7 @@ unset($e_ROOT);
class installLog class installLog
{ {
const logFile = "e107InstallLog.log"; const logFile = "e107Install.log";
static function exceptionHandler(Exception $exception) static function exceptionHandler(Exception $exception)
@@ -53,7 +53,7 @@ class installLog
self::add($message, "error"); 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; $error = "Error on line $errline in file ".$errfile." : ".$errstr;
@@ -143,7 +143,7 @@ define("e_UC_NOBODY", 255);*/
define("E107_INSTALL",true); 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. error_reporting(0); // suppress all errors unless debugging.
} }
@@ -159,13 +159,13 @@ if($_SERVER['QUERY_STRING'] === 'clear')
//error_reporting(E_ALL); //error_reporting(E_ALL);
function e107_ini_set($var, $value) /*function e107_ini_set($var, $value)
{ {
if (function_exists('ini_set')) if (function_exists('ini_set'))
{ {
ini_set($var, $value); ini_set($var, $value);
} }
} }*/
// setup some php options // setup some php options
@@ -198,7 +198,7 @@ if($inc_path[0] !== ".")
{ {
array_unshift($inc_path, "."); array_unshift($inc_path, ".");
$inc_path = implode(PATH_SEPARATOR, $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); unset($inc_path);