Merge branch 'beta' into devel

This commit is contained in:
Andre Lorbach 2009-08-13 16:51:12 +02:00
commit 6329e2998e
2 changed files with 4 additions and 2 deletions

View File

@ -515,7 +515,8 @@ function CheckAndSetRunMode()
$content['MaxExecutionTime'] = ini_get("max_execution_time");
// Define and Inits Syslog variables now!
define_syslog_variables();
// DEPRECIATED! define_syslog_variables();
// Syslog Constants are defined by default anyway!
openlog("phpLogCon", LOG_PID, LOG_USER);
// --- Check necessary PHP Extensions!

View File

@ -391,7 +391,8 @@ else if ( $content['INSTALL_STEP'] == 5 )
$totaldbdefs = str_replace( "`logcon_", "`" . $_SESSION["UserDBPref"], $totaldbdefs );
// Now split by sql command
$mycommands = split( ";\n", $totaldbdefs );
// $mycommands = split( ";\n", $totaldbdefs ); DEPRECEATED CALL!
$mycommands = preg_split('/;\n/', $totaldbdefs, -1, PREG_SPLIT_NO_EMPTY);
// // check for different linefeed
// if ( count($mycommands) <= 1 )