diff options
| author | patdenice <patdenice@piwigo.org> | 2010-07-28 16:17:53 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2010-07-28 16:17:53 +0000 |
| commit | 1323e7dd364dfedf16fd6837683a140cbe15c248 (patch) | |
| tree | 77de0bea00f5e52f95c9e9b613c47ef4e52c4602 | |
| parent | b0e523b218dbd272cf65fe6e8c69d929b9f8e2b4 (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
| -rw-r--r-- | admin/include/plugins.class.php | 2 | ||||
| -rw-r--r-- | plugins/language_switch/main.inc.php | 2 |
2 files changed, 3 insertions, 1 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).'.'", '.', ''); 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 |