mirror of
https://github.com/rsyslog/loganalyzer.git
synced 2025-09-25 18:59:12 +02:00
Merge branch 'v2-stable' into beta
Conflicts: src/include/functions_common.php
This commit is contained in:
commit
8b754c3535
@ -37,7 +37,7 @@ $gl_root_path = './../';
|
|||||||
|
|
||||||
// Now include necessary include files!
|
// Now include necessary include files!
|
||||||
include_once($gl_root_path . 'include/functions_common.php');
|
include_once($gl_root_path . 'include/functions_common.php');
|
||||||
include_once($gl_root_path . 'include/functions_debugoutput.php');
|
//include_once($gl_root_path . 'include/functions_debugoutput.php');
|
||||||
|
|
||||||
// Set commandline mode for the script
|
// Set commandline mode for the script
|
||||||
define('IN_PHPLOGCON_COMMANDLINE', true);
|
define('IN_PHPLOGCON_COMMANDLINE', true);
|
||||||
|
@ -66,7 +66,7 @@ $LANG_EN = "en"; // Used for fallback
|
|||||||
$LANG = "en"; // Default language
|
$LANG = "en"; // Default language
|
||||||
|
|
||||||
// Default Template vars
|
// Default Template vars
|
||||||
$content['BUILDNUMBER'] = "2.7.2";
|
$content['BUILDNUMBER'] = "2.7.3";
|
||||||
$content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER']; // Default page title
|
$content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER']; // Default page title
|
||||||
$content['BASEPATH'] = $gl_root_path;
|
$content['BASEPATH'] = $gl_root_path;
|
||||||
$content['SHOW_DONATEBUTTON'] = true; // Default = true!
|
$content['SHOW_DONATEBUTTON'] = true; // Default = true!
|
||||||
|
Loading…
x
Reference in New Issue
Block a user