Commit b8b15889 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner

(legacy) spacing / curly braces in config.lib.inc

(cherry picked from commit 9defc2f4)
parent 7c407af8
...@@ -54,7 +54,7 @@ function alias_make_table($config) ...@@ -54,7 +54,7 @@ function alias_make_table($config)
} }
} }
} }
} }
/****f* config/parse_config /****f* config/parse_config
* NAME * NAME
...@@ -196,7 +196,6 @@ function write_config($desc = 'Unknown', $backup = true) ...@@ -196,7 +196,6 @@ function write_config($desc = 'Unknown', $backup = true)
// on succesfull save, serialize config back to global. // on succesfull save, serialize config back to global.
$config = $cnf->toArray(listtags()); $config = $cnf->toArray(listtags());
return $config; return $config;
} }
/****f* config/reset_factory_defaults /****f* config/reset_factory_defaults
...@@ -314,8 +313,9 @@ function make_config_revision_entry($desc = null, $override_user = null) ...@@ -314,8 +313,9 @@ function make_config_revision_entry($desc = null, $override_user = null)
if (empty($override_user)) { if (empty($override_user)) {
if (empty($_SESSION["Username"])) { if (empty($_SESSION["Username"])) {
$username = getenv("USER"); $username = getenv("USER");
if (empty($conuser) || $conuser == "root") if (empty($username) || $username == "root") {
$username = "(system)"; $username = "(system)";
}
} else { } else {
$username = $_SESSION["Username"]; $username = $_SESSION["Username"];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment