diff --git a/module/common/model.php b/module/common/model.php index e3e5c50fa9..d5d87aa2e6 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1154,8 +1154,6 @@ EOD; { $preAndNextObject = new stdClass(); - if(strpos('story, task, bug, testcase, doc', $type) === false) return $preAndNextObject; - /* Use existObject when the preAndNextObject of this objectID has exist in session. */ $existObject = $type . 'PreAndNext'; if(isset($_SESSION[$existObject]) and $_SESSION[$existObject]['objectID'] == $objectID) return $_SESSION[$existObject]['preAndNextObject']; diff --git a/module/doc/css/view.css b/module/doc/css/view.css index c4ea111eca..b7e0dcbb93 100644 --- a/module/doc/css/view.css +++ b/module/doc/css/view.css @@ -17,5 +17,4 @@ .main-row > .main-col .article-content {transition: max-width; margin: 0 auto!important;} .main-row > .side-col > .cell {transition: opacity .2s;} .doc-fullscreen .main-row > .side-col {width: 0; position: relative; overflow: hidden} -.doc-fullscreen .main-row > .side-col > .cell {opacity: 0} .doc-fullscreen .fullscreen-btn > .icon-fullscreen:before {content: '\e972'} diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 9a6c4ca61f..80b7638b34 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -426,8 +426,7 @@ class upgradeModel extends model if(isset($out[1][0])) { $fields = array(); - $table = $out[1][0]; - $table = str_replace('zt_', $this->config->db->prefix, $out[1][0]); + $table = str_replace('zt_', $this->config->db->prefix, $out[1][0]); try { $tableExists = true; diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 4d9eb53882..00d8b852e9 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -49,7 +49,7 @@ - +
user->accountInfo;?>
user->account;?>user->account;?> account, "class='form-control' autocomplete='off'");?> user->email;?>