summaryrefslogtreecommitdiff
path: root/install_version.php
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2009-01-28 10:48:35 +0000
committerMax Kremmel <xing@synapse.plus.com>2009-01-28 10:48:35 +0000
commit1e198d824fd86ebc936a2d6f857b2d4502534178 (patch)
tree0d2a4178c0eebe4c935f5cf32f030af71e9bbf99 /install_version.php
parentc2054afa7eedc62aedf37d0fd2e6deed0d04d170 (diff)
downloadinstall-1e198d824fd86ebc936a2d6f857b2d4502534178.tar.gz
install-1e198d824fd86ebc936a2d6f857b2d4502534178.tar.bz2
install-1e198d824fd86ebc936a2d6f857b2d4502534178.zip
use getBitVersion to fetch bitweaver version number set in kernel/config_defaults_inc.php
Diffstat (limited to 'install_version.php')
-rw-r--r--install_version.php12
1 files changed, 4 insertions, 8 deletions
diff --git a/install_version.php b/install_version.php
index dc5bf6f..fdc91ec 100644
--- a/install_version.php
+++ b/install_version.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_install/install_version.php,v 1.2 2009/01/26 17:27:53 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_install/install_version.php,v 1.3 2009/01/28 10:48:35 squareing Exp $
* @package install
* @subpackage functions
*/
@@ -9,7 +9,7 @@
$gBitSmarty->assign( 'next_step', $step );
// check if database version is up to date
-if( version_compare( BIT_MAJOR_VERSION.".".BIT_MINOR_VERSION.".".BIT_SUB_VERSION."-".BIT_LEVEL, $gBitSystem->getVersion(), '==' )) {
+if( version_compare( $gBitSystem->getBitVersion(), $gBitSystem->getVersion(), '==' )) {
$upToDate = TRUE;
$gBitSmarty->assign( 'upToDate', $upToDate );
}
@@ -51,12 +51,8 @@ if( !empty( $_REQUEST['update_version'] )) {
// if we're already up to date, we'll simply move on to the next page
bit_redirect( $_SERVER['PHP_SELF']."?step=".++$step );
} else {
- $bitversion = BIT_MAJOR_VERSION.".".BIT_MINOR_VERSION.".".BIT_SUB_VERSION;
- if( defined( BIT_LEVEL ) && BIT_LEVEL != '' ) {
- $bitversion .= '-'.BIT_LEVEL;
- }
-
- if( $gBitSystem->storeVersion( NULL, $bitversion )) {
+ // set the version of bitweaver in the database
+ if( $gBitSystem->storeVersion( NULL, $gBitSystem->getBitVersion() )) {
// display the confirmation page
$gBitSmarty->assign( 'next_step', $step + 1 );
$app = '_done';