archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 2671: use get_branch_from_version() to find the real branch, however the version looks like

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@16179 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2012-06-29 15:08:00 +00:00
parent d4402725e1
commit 9883bd67ef
4 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/include/languages.class.php
View file

@ -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)

11
admin/include/plugins.class.php
View file

@ -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)

2
admin/include/themes.class.php
View file

@ -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)

2
admin/include/updates.class.php
View file

@ -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)