Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix a bug for upgrade to zentaopro.

Browse Source
This commit is contained in:
wangyidong
2013-05-02 06:04:02 +00:00
parent cc597b4633
commit f4c2efbf9b
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/index.php
View File

@@ -38,7 +38,7 @@ $common = $app->loadCommon();
/* Check for need upgrade. */
$config->installedVersion = $common->loadModel('setting')->getVersion();
if(version_compare($config->version, $config->installedVersion, '>')) die(header('location: upgrade.php'));
if(!(!is_numeric($config->version{0}) and $config->version{0} != $config->installedVersion{0}) and version_compare($config->version, $config->installedVersion, '>')) die(header('location: upgrade.php'));
$app->parseRequest();
$common->checkPriv();

13
www/js/my.full.js
View File

@@ -417,13 +417,12 @@ function setOuterBox()
var headerH = $('#header').height();
var navbarH = $('#modulemenu').parent().parent().height();
var footerH = $('#footer').height() + 15;
if(document.documentElement.clientHeight >= document.documentElement.scrollHeight)
{
var outerH = winHeight - headerH - footerH - navbarH - 37;
if ($.browser.msie && ($.browser.version == "6.0") && !$.support.style) outerH = winHeight - headerH - footerH - 98;
if ($.browser.msie && ($.browser.version == "6.0")) $('.outer').css('height', outerH);
$('.outer').css('min-height', outerH);
}
var outerH = winHeight - headerH - footerH - navbarH - 37;
if ($.browser.msie && ($.browser.version == "6.0") && !$.support.style) outerH = winHeight - headerH - footerH - 98;
if ($.browser.msie && ($.browser.version == "6.0")) $('.outer').css('height', outerH);
$('.outer').css('min-height', outerH);
if($.browser.msie && ($.browser.version == "6.0") && !$.support.style)
{
winWidth -= 49;