From 1323e7dd364dfedf16fd6837683a140cbe15c248 Mon Sep 17 00:00:00 2001 From: patdenice Date: Wed, 28 Jul 2010 16:17:53 +0000 Subject: 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 --- admin/include/plugins.class.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'admin/include') 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).'.'", '.', ''); -- cgit v1.2.3