Merged revision(s) r19167 from trunk:

bug:2793 use "include_once" instead of "include" when including pclzip

git-svn-id: http://piwigo.org/svn/branches/2.4@19168 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 4 insertions, 4 deletions

diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php
index 7ef3bc6b1..460568833 100644
--- a/admin/include/languages.class.php
+++ b/admin/include/languages.class.php
@@ -319,7 +319,7 @@ UPDATE '.USER_INFOS_TABLE.'
       if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
       {
         fclose($handle);
-        include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
+        include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
         $zip = new PclZip($archive);
         if ($list = $zip->listContent())
         {
diff --git a/admin/include/photos_add_direct_process.inc.php b/admin/include/photos_add_direct_process.inc.php
index dc4ae4827..c3271eea1 100644
--- a/admin/include/photos_add_direct_process.inc.php
+++ b/admin/include/photos_add_direct_process.inc.php
@@ -82,7 +82,7 @@ if (isset($_GET['processed']))
           );
 
         define('PCLZIP_TEMPORARY_DIR', $upload_dir.'/');
-        include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
+        include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
         $zip = new PclZip($archive_path);
         if ($list = $zip->listContent())
         {
diff --git a/admin/include/plugins.class.php b/admin/include/plugins.class.php
index 5d44179e6..a63274efe 100644
--- a/admin/include/plugins.class.php
+++ b/admin/include/plugins.class.php
@@ -460,7 +460,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
       if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
       {
         fclose($handle);
-        include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
+        include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
         $zip = new PclZip($archive);
         if ($list = $zip->listContent())
         {
diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php
index cb754a099..c370f03e0 100644
--- a/admin/include/themes.class.php
+++ b/admin/include/themes.class.php
@@ -577,7 +577,7 @@ SELECT
       if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
       {
         fclose($handle);
-        include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
+        include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
         $zip = new PclZip($archive);
         if ($list = $zip->listContent())
         {