From 1323e7dd364dfedf16fd6837683a140cbe15c248 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
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 ++
 plugins/language_switch/main.inc.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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).'.'", '.', '');
 
diff --git a/plugins/language_switch/main.inc.php b/plugins/language_switch/main.inc.php
index fc430cd2f..9263e90e1 100644
--- a/plugins/language_switch/main.inc.php
+++ b/plugins/language_switch/main.inc.php
@@ -23,7 +23,7 @@
 
 /*
 Plugin Name: Language Switch
-Version: Auto
+Version: 2.1.1
 Description: Switch to another language from flags on your gallery home page.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=123
 Author: Piwigo team
-- 
cgit v1.2.3