fix bug where siteroot was not configuredcd

remotes/origin/stable
Robin 15 years ago
parent 35b9aabd01
commit cd96e2a313
  1. 7
      config/config.php

@ -26,7 +26,7 @@ function getConfig(){
} }
function writeConfig($config){ function writeConfig($config){
$allowed=array('CONFIG_FOOTEROWNERNAME','CONFIG_FOOTEROWNEREMAIL','CONFIG_ADMINLOGIN','CONFIG_ADMINPASSWORD','CONFIG_DBHOST','CONFIG_DBNAME','CONFIG_DBUSER','CONFIG_DBPWD','CONFIG_DOCUMENTROOT','CONFIG_DATADIRECTORY','CONFIG_HTTPFORCESSL','CONFIG_DATEFORMAT'); $allowed=array('CONFIG_FOOTEROWNERNAME','CONFIG_FOOTEROWNEREMAIL','CONFIG_ADMINLOGIN','CONFIG_ADMINPASSWORD','CONFIG_DBHOST','CONFIG_DBNAME','CONFIG_DBUSER','CONFIG_DBPWD','CONFIG_DOCUMENTROOT','CONFIG_DATADIRECTORY','CONFIG_HTTPFORCESSL','CONFIG_DATEFORMAT','CONFIG_SITEROOT');
$requireRetype=array('CONFIG_ADMINPASSWORD','CONFIG_DBPWD'); $requireRetype=array('CONFIG_ADMINPASSWORD','CONFIG_DBPWD');
foreach($requireRetype as $name){ foreach($requireRetype as $name){
if($config[$name]!=$config[$name.'_RETYPE']){ if($config[$name]!=$config[$name.'_RETYPE']){
@ -57,6 +57,11 @@ function writeConfig($config){
//config_placeholder //config_placeholder
if(!isset($CONFIG_ADMINLOGIN)){ if(!isset($CONFIG_ADMINLOGIN)){
if(!isset($_POST['CONFIG_FOOTEROWNERNAME'])){ if(!isset($_POST['CONFIG_FOOTEROWNERNAME'])){
getConfig(); getConfig();

Loading…
Cancel
Save