From c8fb2b778491036db4c1b5f4fcc3b9a3c21efcc1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 07 Jun 2008 09:34:41 -0400
Subject: [PATCH] Update UPGRADNG instructions + add SVN revision to version string (if available)
---
UPGRADING | 8 +++++++-
program/include/rcube_template.php | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/UPGRADING b/UPGRADING
index e99fc35..996b4f2 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,7 +1,11 @@
UPDATE instructions
===================
-Follow these instructions if upgrading from a previous version
+First you should remove all subfolders from /program/localization/
+because most language codes have changed in 0.2-alpha. This way you
+can make sure that no old localization files remain on your disk.
+
+Then follow these instructions if upgrading from a previous version
of RoundCube Webmail.
from version 0.1.1
@@ -10,6 +14,8 @@
* replace all files in folder /bin/
* replace all files in folder /program/
* replace all files in folder /skins/default/
+* run all commands in SQL/[yourdbtype].update.sql
+ below the line "-- Updates from version 0.1.1"
* check the config/main.inc.php.dist for new configuration
options and add them to your config
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index d519f75..2173784 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -534,7 +534,12 @@
return Q($name);
}
if ($object=='version') {
- return (string)RCMAIL_VERSION;
+ $ver = (string)RCMAIL_VERSION;
+ if (is_file(INSTALL_PATH . '.svn/entries')) {
+ if (preg_match('/Revision:\s(\d+)/', @shell_exec('svn info'), $regs))
+ $ver .= ' [SVN r'.$regs[1].']';
+ }
+ return $ver;
}
if ($object=='pagetitle') {
$task = $this->task;
--
Gitblit v1.9.1