Changeset 1537

Timestamp:

12/19/2009 01:45:00 AM (9 months ago)

Author:

BrianKoontz

Message:

Update versioning code; new version set to 1.3. Refs #912.

Location:

branches/1.3

Files:

• version.php (modified) (1 diff)
• wikka.php (modified) (1 diff)

branches/1.3/version.php

@@ -20 +20 @@
 // ---------------------------- VERSIONING ------------------------------------
 /**
- * Defines the current Wikka version.
- * Leave null except for release versions!
+ * Used to generate WAKKA_VERSION value. Changes here might be
+ * modified during SVN checkin.  Note to end users: Changing this
+ * version number might result in problems upgrading...please use
+ * caution.
  */
 $svn_version = '1.3';
+if (!defined('WAKKA_VERSION')) define('WAKKA_VERSION', $svn_version);
 
 /**
- * Used to generate WAKKA_VERSION value. Changes here might be
- * modified during SVN checkin.
+ * Defines the current Wikka patch level. This should be 0 by default, 
+ * and does not need to be changed for major/minor releases.
  */
-$svn_revision = '$Rev: 1481 $';
-if(empty($svn_version))
-{
-        list($t1, $svn_version, $t2) = explode(' ', $svn_revision);
-        $svn_version = 'trunk-'.trim($svn_version);
-}
-if (!defined('WAKKA_VERSION')) define('WAKKA_VERSION', $svn_version);
+if(!defined('WIKKA_PATCH_LEVEL')) define('WIKKA_PATCH_LEVEL', '0');
 ?>

branches/1.3/wikka.php

@@ -60 +60 @@
 if(!defined('WIKKA_LANG_PATH')) define('WIKKA_LANG_PATH', $default_lang_path);
 
-/**
- * Defines the current Wikka version. Do not change the version number or you will have problems upgrading.
- */
-if (!defined('WAKKA_VERSION')) define('WAKKA_VERSION', '1.2');
-
-/**
- * Defines the current Wikka patch level. This should be 0 by default, 
- * and does not need to be changed for major/minor releases.
- */
-if(!defined('WIKKA_PATCH_LEVEL')) define('WIKKA_PATCH_LEVEL', '1');
-
+/**#@+
+ * Defines current Wikka version.
+ */
+include_once('version.php');
 
 /**#@+