aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-07-28 16:17:53 +0000
committerpatdenice <patdenice@piwigo.org>2010-07-28 16:17:53 +0000
commit1323e7dd364dfedf16fd6837683a140cbe15c248 (patch)
tree77de0bea00f5e52f95c9e9b613c47ef4e52c4602 /admin
parentb0e523b218dbd272cf65fe6e8c69d929b9f8e2b4 (diff)
merge r6724 from branch 2.1 to trunk
Plugin version compare must return false if plugin version is "auto" (developpement version). Change language switch version number. git-svn-id: http://piwigo.org/svn/trunk@6725 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/plugins.class.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index b099fc4e9..2de666c04 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -524,6 +524,8 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
*/
function plugin_version_compare($a, $b)
{
+ if (strtolower($a) == 'auto') return false;
+
$pattern = array('/([a-z])/ei', '/\.+/', '/\.\Z|\A\./');
$replacement = array( "'.'.intval('\\1', 36).'.'", '.', '');