diff options
| author | plegall <plg@piwigo.org> | 2011-06-01 10:45:45 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2011-06-01 10:45:45 +0000 |
| commit | 53b859811fd8436b8b51675cec7f201b64f31f62 (patch) | |
| tree | 2d6c8306108019c0a7ebfa5668d0a8b84275f305 /admin | |
| parent | d29c7cd0a8dd9f4bac86423fdbf06ecabcbc58f8 (diff) | |
bug fixed: accept Piwigo version with a pattern like 2.3.0beta1 in plugins/themes/languages/updates management classes
git-svn-id: http://piwigo.org/svn/trunk@11185 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/languages.class.php | 2 | ||||
| -rw-r--r-- | admin/include/plugins.class.php | 2 | ||||
| -rw-r--r-- | admin/include/themes.class.php | 2 | ||||
| -rw-r--r-- | admin/include/updates.class.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php index cfcacc934..b55024992 100644 --- a/admin/include/languages.class.php +++ b/admin/include/languages.class.php @@ -230,7 +230,7 @@ UPDATE '.USER_INFOS_TABLE.' $url = PEM_URL . '/api/get_version_list.php'; if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result)) { - if (!preg_match('/^\d+\.\d+\.\d+/', $version)) + if (!preg_match('/^\d+\.\d+\.\d+$/', $version)) { $version = $pem_versions[0]['name']; } diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php index 22e58857c..b74b2ab7d 100644 --- a/admin/include/plugins.class.php +++ b/admin/include/plugins.class.php @@ -269,7 +269,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\''; $url = PEM_URL . '/api/get_version_list.php?category=12&format=php'; if (fetchRemote($url, $result) and $pem_versions = @unserialize($result)) { - if (!preg_match('/^\d+\.\d+\.\d+/', $version)) + if (!preg_match('/^\d+\.\d+\.\d+$/', $version)) { $version = $pem_versions[0]['name']; } diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php index 294046976..a6e234b49 100644 --- a/admin/include/themes.class.php +++ b/admin/include/themes.class.php @@ -441,7 +441,7 @@ SELECT $url = PEM_URL . '/api/get_version_list.php'; if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result)) { - if (!preg_match('/^\d+\.\d+\.\d+/', $version)) + if (!preg_match('/^\d+\.\d+\.\d+$/', $version)) { $version = $pem_versions[0]['name']; } diff --git a/admin/include/updates.class.php b/admin/include/updates.class.php index 61fe455d3..1586df8c3 100644 --- a/admin/include/updates.class.php +++ b/admin/include/updates.class.php @@ -59,7 +59,7 @@ class updates $url = PEM_URL . '/api/get_version_list.php';
if (fetchRemote($url, $result, $get_data) and $pem_versions = @unserialize($result))
{
- if (!preg_match('/^\d+\.\d+\.\d+/', $version))
+ if (!preg_match('/^\d+\.\d+\.\d+$/', $version))
{
$version = $pem_versions[0]['name'];
}
|