gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 07:04:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2015-06-30 07:53:13 +02:00
commit 8ca8ae97bb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassSettings.php
View File

@ -187,6 +187,8 @@ class Settings { /* {{{ */
var $_showMissingTranslations = false;
// Extra Path to additional software, will be added to include path
var $_extraPath = null;
// do not check version of database
var $_doNotCheckDBVersion = false;
// DB-Driver used by adodb (see adodb-readme)
var $_dbDriver = "mysql";
// DB-Server
@ -441,6 +443,7 @@ class Settings { /* {{{ */
$this->_dbDatabase = strval($tab["dbDatabase"]);
$this->_dbUser = strval($tab["dbUser"]);
$this->_dbPass = strval($tab["dbPass"]);
$this->_doNotCheckDBVersion = Settings::boolVal($tab["doNotCheckVersion"]);
// XML Path: /configuration/system/smtp
$node = $xml->xpath('/configuration/system/smtp');
@ -733,6 +736,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "dbDatabase", $this->_dbDatabase);
$this->setXMLAttributValue($node, "dbUser", $this->_dbUser);
$this->setXMLAttributValue($node, "dbPass", $this->_dbPass);
$this->setXMLAttributValue($node, "doNotCheckVersion", $this->_doNotCheckVersion);
// XML Path: /configuration/system/smtp
$node = $this->getXMLNode($xml, '/configuration/system', 'smtp');

2
inc/inc.DBInit.php
View File

@ -47,7 +47,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
if(!$dms->checkVersion()) {
if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
echo "Database update needed.";
exit;
}