summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPGRADING8
-rwxr-xr-xprogram/include/rcube_template.php7
2 files changed, 13 insertions, 2 deletions
diff --git a/UPGRADING b/UPGRADING
index e99fc3520..996b4f258 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 @@ from version 0.1.1
* 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 d519f7533..2173784b6 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -534,7 +534,12 @@ class rcube_template extends rcube_html_page
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;