aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-04-20 21:54:56 +0000
committerplegall <plg@piwigo.org>2006-04-20 21:54:56 +0000
commitd766c69272ece6def7e72469999d5d4e762262da (patch)
treeab1a649f07b751fc994bbf1024546e7a332ee057 /admin
parentb11f25eb0b44f29ef72087eae39d473fd36cffdc (diff)
merge -r990:991 from branch 1.5 to branch 1.6 (bug 196 fixed)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1227 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/intro.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/admin/intro.php b/admin/intro.php
index 42e499de4..9c6ffa088 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -82,7 +82,9 @@ if (isset($_GET['action']) and 'check_upgrade' == $_GET['action'])
l10n('Check for upgrade failed for unknown reasons.')
);
}
- else if ('%PWGVERSION%' == $versions{'current'})
+ // concatenation needed to avoid automatic transformation by release
+ // script generator
+ else if ('%'.'PWGVERSION'.'%' == $versions{'current'})
{
array_push(
$page['infos'],