do not read preview width from settings if not set

This commit is contained in:
Uwe Steinmann 2014-03-20 08:17:46 +01:00
parent 134915aa71
commit ac630948da

View File

@ -309,8 +309,10 @@ class Settings { /* {{{ */
$this->_printDisclaimer = Settings::boolVal($tab["printDisclaimer"]); $this->_printDisclaimer = Settings::boolVal($tab["printDisclaimer"]);
$this->_language = strval($tab["language"]); $this->_language = strval($tab["language"]);
$this->_theme = strval($tab["theme"]); $this->_theme = strval($tab["theme"]);
$this->_previewWidthList = intval($tab["previewWidthList"]); if(isset($tab["previewWidthList"]))
$this->_previewWidthDetail = intval($tab["previewWidthDetail"]); $this->_previewWidthList = intval($tab["previewWidthList"]);
if(isset($tab["previewWidthDetail"]))
$this->_previewWidthDetail = intval($tab["previewWidthDetail"]);
// XML Path: /configuration/site/edition // XML Path: /configuration/site/edition
$node = $xml->xpath('/configuration/site/edition'); $node = $xml->xpath('/configuration/site/edition');
@ -320,7 +322,7 @@ class Settings { /* {{{ */
$this->_enableConverting = Settings::boolVal($tab["enableConverting"]); $this->_enableConverting = Settings::boolVal($tab["enableConverting"]);
$this->_enableEmail = Settings::boolVal($tab["enableEmail"]); $this->_enableEmail = Settings::boolVal($tab["enableEmail"]);
$this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]); $this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]);
$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]); $this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]); $this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]); $this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]); $this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);