From adce496a004fd4c8fbc1a966dea16ee2dc08caf0 Mon Sep 17 00:00:00 2001 From: patdenice Date: Fri, 10 Oct 2008 13:13:12 +0000 Subject: [PATCH] - If there is not new plugins to check, we don't get any more error message. - small corrections in configuration.html and cat_modify.tpl. git-svn-id: http://piwigo.org/svn/trunk@2701 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/plugins.class.php | 11 ++++++++--- admin/template/goto/cat_modify.tpl | 2 +- language/en_UK/help/configuration.html | 5 +++-- language/es_ES/help/configuration.html | 5 +++-- language/fr_FR/help/configuration.html | 5 +++-- language/it_IT/help/configuration.html | 5 +++-- language/nl_NL/help/configuration.html | 5 +++-- 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php index 2d2bd3afe..ff478be83 100644 --- a/admin/include/plugins.class.php +++ b/admin/include/plugins.class.php @@ -25,7 +25,7 @@ class plugins { var $fs_plugins = array(); var $db_plugins_by_id = array(); - var $server_plugins; + var $server_plugins = array(); /** * Initialize $fs_plugins and $db_plugins_by_id @@ -302,14 +302,19 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id="' . $plugin_id . '"'; // Retrieve PEM plugins infos $url = PEM_URL . '/api/get_revision_list.php?category_id=12&format=php&last_revision_only=true'; $url .= '&version=' . implode(',', $versions_to_check); + if (!empty($plugins_to_check)) { $url .= $new ? '&extension_exclude=' : '&extension_include='; $url .= implode(',', $plugins_to_check); } - if ($source = @file_get_contents($url) - and $pem_plugins = @unserialize($source)) + if ($source = @file_get_contents($url)) { + $pem_plugins = @unserialize($source); + if (!is_array($pem_plugins)) + { + return false; + } foreach ($pem_plugins as $plugin) { $this->server_plugins[$plugin['extension_id']] = $plugin; diff --git a/admin/template/goto/cat_modify.tpl b/admin/template/goto/cat_modify.tpl index d27311c7b..4648b92d8 100644 --- a/admin/template/goto/cat_modify.tpl +++ b/admin/template/goto/cat_modify.tpl @@ -108,7 +108,7 @@ {html_options options=$image_order_field_options selected=$order.FIELD }
{/foreach} diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html index de685058a..da4c59a75 100644 --- a/language/en_UK/help/configuration.html +++ b/language/en_UK/help/configuration.html @@ -4,7 +4,7 @@ screen only shows simple configuration parameters that should be enough for the vast majority of administrators. If you want to see other numerous (and advanced) configuration parameters, read file include/config_default.inc.php.

+class="filename">include/config_default.inc.php.

This screen is divided in several sections, regrouping configuration parameters by theme.

@@ -37,7 +37,7 @@ page.

History

-