Project

General

Profile

« Previous | Next » 

Revision 1589

Added by Dietmar over 12 years ago

fixed starting upgrade-script if missing revision in settings

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
=========================== add small Features 2.8.2 ==========================
14
25 Jan-2012 Build 1589 Dietmar Woellbrink (Luisehahne)
15
# fixed starting upgrade-script if missing revision in settings
14 16
25 Jan-2012 Build 1588 Werner v.d.Decken(DarkViper)
15 17
# all module depending code removed, some little fixes, better integration for module-upgrade
16 18
25 Jan-2012 Build 1587 Werner v.d.Decken(DarkViper)
branches/2.8.x/wb/admin/start/index.php
58 58
	// check if it is neccessary to start the uograde-script
59 59
	$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'wb_revision\'';
60 60
	if($wb_revision=$database->get_one($sql)) {
61
		if (version_compare($wb_revision, REVISION ) < 0) {
62
			if(!headers_sent()) {
63
				header('Location: '.WB_URL.'/upgrade-script.php');
64
			    exit;
65
			} else {
66
			    echo "<p style=\"text-align:center;\"> The <strong>upgrade script</strong> could not be start automatically.\n" .
67
			         "Please click <a style=\"font-weight:bold;\" " .
68
			         "href=\"".WB_URL."/upgrade-script.php\">on this link</a> to start the script!</p>\n";
69
			    exit;
70
			}
61
	}
62
	if (version_compare($wb_revision, REVISION ) < 0) {
63
		if(!headers_sent()) {
64
			header('Location: '.WB_URL.'/upgrade-script.php');
65
		    exit;
71 66
		} else {
72
			$msg .= (file_exists(WB_PATH.'/upgrade-script.php') ? ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />' : '');
67
		    echo "<p style=\"text-align:center;\"> The <strong>upgrade script</strong> could not be start automatically.\n" .
68
		         "Please click <a style=\"font-weight:bold;\" " .
69
		         "href=\"".WB_URL."/upgrade-script.php\">on this link</a> to start the script!</p>\n";
70
		    exit;
73 71
		}
74 72
	}
73
	$msg .= ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />';
75 74
}
76 75

  
77 76
// Setup template object, parse vars to it, then parse it
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.2');
54
if(!defined('REVISION')) define('REVISION', '1588');
54
if(!defined('REVISION')) define('REVISION', '1589');
55 55
if(!defined('SP')) define('SP', 'SP2');

Also available in: Unified diff