From 9883bd67ef1c12a6c7b981094341268b115a45ce Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Fri, 29 Jun 2012 15:08:00 +0000
Subject: bug 2671: use get_branch_from_version() to find the real branch,
 however the version looks like

git-svn-id: http://piwigo.org/svn/trunk@16179 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/languages.class.php |  2 +-
 admin/include/plugins.class.php   | 11 +----------
 admin/include/themes.class.php    |  2 +-
 admin/include/updates.class.php   |  2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'admin')

diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php
index 3698de2bf..7ef3bc6b1 100644
--- a/admin/include/languages.class.php
+++ b/admin/include/languages.class.php
@@ -234,7 +234,7 @@ UPDATE '.USER_INFOS_TABLE.'
       {
         $version = $pem_versions[0]['name'];
       }
-      $branch = substr($version, 0, strrpos($version, '.'));
+      $branch = get_branch_from_version($version);
       foreach ($pem_versions as $pem_version)
       {
         if (strpos($pem_version['name'], $branch) === 0)
diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index 65e22b7b1..5d44179e6 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -275,16 +275,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
       {
         $version = $pem_versions[0]['name'];
       }
-      
-      if (substr_count($version, '.') > 1)
-      {
-        $branch = substr($version, 0, strrpos($version, '.'));
-      }
-      else
-      {
-        $branch = $version;
-      }
-      
+      $branch = get_branch_from_version($version);
       foreach ($pem_versions as $pem_version)
       {
         if (strpos($pem_version['name'], $branch) === 0)
diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php
index dd783d7aa..cb754a099 100644
--- a/admin/include/themes.class.php
+++ b/admin/include/themes.class.php
@@ -471,7 +471,7 @@ SELECT
       {
         $version = $pem_versions[0]['name'];
       }
-      $branch = substr($version, 0, strrpos($version, '.'));
+      $branch = get_branch_from_version($version);
       foreach ($pem_versions as $pem_version)
       {
         if (strpos($pem_version['name'], $branch) === 0)
diff --git a/admin/include/updates.class.php b/admin/include/updates.class.php
index 3a81fbb0f..0ec0e0c40 100644
--- a/admin/include/updates.class.php
+++ b/admin/include/updates.class.php
@@ -63,7 +63,7 @@ class updates
       {
         $version = $pem_versions[0]['name'];
       }
-      $branch = substr($version, 0, strrpos($version, '.'));
+      $branch = get_branch_from_version($version);
       foreach ($pem_versions as $pem_version)
       {
         if (strpos($pem_version['name'], $branch) === 0)
-- 
cgit v1.2.3