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
This commit is contained in:
patdenice 2010-07-28 16:17:53 +00:00
parent b0e523b218
commit 1323e7dd36
2 changed files with 3 additions and 1 deletions

View file

@ -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).'.'", '.', '');