summaryrefslogtreecommitdiff
path: root/installer/installer.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2013-02-26 08:34:21 -0800
committerBharat Mediratta <bharat@menalto.com>2013-02-26 08:34:21 -0800
commit80356e857d02e88de0dd4791496af270b6dcdae7 (patch)
tree794705c1909a53a9229ce0dee3ce5206cd852dcc /installer/installer.php
parent6993a88669d19be84f59dcadbe679a6b005e038f (diff)
parentd012cddf78d3055c8c49af7a7287117940f2c034 (diff)
Merge pull request #167 from shadlaws/fix_2020
#2020 - Add CLI install argument to set admin password.
Diffstat (limited to 'installer/installer.php')
-rw-r--r--installer/installer.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/installer/installer.php b/installer/installer.php
index 4ce80ee7..434d8e53 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -138,7 +138,9 @@ class installer {
$char += ($char > 90) ? 13 : ($char > 57) ? 7 : 0;
$salt .= chr($char);
}
- $password = substr(md5(time() . mt_rand()), 0, 6);
+ if (!$password = $config["g3_password"]) {
+ $password = substr(md5(time() . mt_rand()), 0, 6);
+ }
// Escape backslash in preparation for our UPDATE statement.
$hashed_password = str_replace("\\", "\\\\", $salt . md5($salt . $password));
$sql = self::prepend_prefix($config["prefix"],