Author: Lars Michelsen <[email protected]>
Date: Thu Dec 15 13:38:49 2011 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Thu Dec 15 13:38:49 2011 +0100
Bugfix: Fixed version number format for stable versions like (1.6)
---
ChangeLog | 1 +
install.sh | 3 +++
share/server/core/classes/GlobalCore.php | 6 ++++++
3 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fef912a..2f4303c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
1.6.1
Core
* LogonDialog: Changed _origin parameter to _origtarget to support current
multisite
+ * Bugfix: Fixed version number format for stable versions like (1.6)
Frontend
* Ajax call for redrawing map objects is not cacheable anymore (prevent
strange
diff --git a/install.sh b/install.sh
index e7eafac..f95e214 100755
--- a/install.sh
+++ b/install.sh
@@ -100,6 +100,9 @@ fmt_version() {
V=${1//a/.0.0}
V=${V//b/.0.2}
V=${V//rc/.0.4}
+ if [ ${#V} -eq 3 ]; then
+ V=${V}.0.60
+ fi
NV=""
for S in "${V//./ }"; do
NV="$NV$(printf %02d $S)"
diff --git a/share/server/core/classes/GlobalCore.php
b/share/server/core/classes/GlobalCore.php
index 0f6aa3b..2f5964a 100644
--- a/share/server/core/classes/GlobalCore.php
+++ b/share/server/core/classes/GlobalCore.php
@@ -530,6 +530,12 @@ class GlobalCore {
public function versionToTag($s) {
$s = str_replace('a', '.0.0', str_replace('b', '.0.2',
str_replace('rc', '.0.4', $s)));
$parts = explode('.', $s);
+ if(count($parts) == 2) {
+ // e.g. 1.6 -> 106060
+ // e.g. 1.5 -> 105060
+ array_push($parts, '0');
+ array_push($parts, '60');
+ }
$tag = '';
foreach($parts AS $part)
$tag .= sprintf("%02s", $part);
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
