diff options
author | friendica <info@friendica.com> | 2012-02-11 01:25:21 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-02-11 01:25:21 -0800 |
commit | 1d5f1723e0a9100783f3999c49c1d60c4ad69541 (patch) | |
tree | 84c49b4b69a3a8ab39266d94425d6c4194e75936 /mod/install.php | |
parent | 75a62db9c5e59adbd1d8dc2d5e0ba3544df3a15e (diff) | |
parent | 857f21eb327828391b747f0f08f04956860b6743 (diff) | |
download | volse-hubzilla-1d5f1723e0a9100783f3999c49c1d60c4ad69541.tar.gz volse-hubzilla-1d5f1723e0a9100783f3999c49c1d60c4ad69541.tar.bz2 volse-hubzilla-1d5f1723e0a9100783f3999c49c1d60c4ad69541.zip |
Merge branch 'pull'
Diffstat (limited to 'mod/install.php')
-rwxr-xr-x | mod/install.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/install.php b/mod/install.php index 33502938a..003d81c6a 100755 --- a/mod/install.php +++ b/mod/install.php @@ -186,8 +186,8 @@ function install_content(&$a) { check_keys($checks); - if(x($_POST,'phppath')) - $phpath = notags(trim($_POST['phppath'])); + if(x($_POST,'phpath')) + $phpath = notags(trim($_POST['phpath'])); check_php($phpath, $checks); @@ -221,7 +221,7 @@ function install_content(&$a) { $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); - $phpath = notags(trim($_POST['phppath'])); + $phpath = notags(trim($_POST['phpath'])); $tpl = get_markup_template('install_db.tpl'); @@ -259,7 +259,7 @@ function install_content(&$a) { $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); - $phpath = notags(trim($_POST['phppath'])); + $phpath = notags(trim($_POST['phpath'])); $adminmail = notags(trim($_POST['adminmail'])); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); @@ -323,7 +323,7 @@ function check_php(&$phpath, &$checks) { $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL; $tpl = get_markup_template('field_input.tpl'); $help .= replace_macros($tpl, array( - '$field' => array('phppath', t('PHP executable path'), $phpath, t('Enter full path to php executable')), + '$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')), )); $phpath=""; } |