- moved extending include_path for adodb from inc.Settings.php into

inc.DBInit.php
This commit is contained in:
steinm 2011-03-10 14:44:55 +00:00
parent 878b2a6175
commit 53f30ad963
2 changed files with 5 additions and 4 deletions

View File

@ -18,6 +18,9 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
if(isset($settings->_ADOdbPath))
ini_set('include_path', $settings->_ADOdbPath.":".ini_get('include_path'));
if(!empty($settings->_coreDir))
require_once($settings->_coreDir.'/Core.php');
else
@ -27,10 +30,12 @@ $db = new LetoDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostna
$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
$dms = new LetoDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
if(!$dms->checkVersion()) {
echo "Database update needed.";
exit;
}
$dms->setRootFolderID($settings->_rootFolderID);
$dms->setEnableAdminRevApp($settings->_enableAdminRevApp);
$dms->setEnableConverting($settings->_enableConverting);

View File

@ -17,7 +17,6 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$_tmp = dirname($_SERVER['SCRIPT_FILENAME']);
if(is_link($_tmp)) {
$_arr = preg_split('/\//', $_tmp);
@ -28,7 +27,4 @@ if(is_link($_tmp)) {
include("../conf/conf.Settings.php");
}
if(isset($settings->_ADOdbPath))
ini_set('include_path', $settings->_ADOdbPath.":".ini_get('include_path'));
?>