mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-06-02 04:15:05 +02:00
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
This commit is contained in:
@@ -319,7 +319,7 @@ UPDATE '.USER_INFOS_TABLE.'
|
|||||||
if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
|
if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
|
||||||
{
|
{
|
||||||
fclose($handle);
|
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);
|
$zip = new PclZip($archive);
|
||||||
if ($list = $zip->listContent())
|
if ($list = $zip->listContent())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ if (isset($_GET['processed']))
|
|||||||
);
|
);
|
||||||
|
|
||||||
define('PCLZIP_TEMPORARY_DIR', $upload_dir.'/');
|
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);
|
$zip = new PclZip($archive_path);
|
||||||
if ($list = $zip->listContent())
|
if ($list = $zip->listContent())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -460,7 +460,7 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
|
|||||||
if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
|
if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
|
||||||
{
|
{
|
||||||
fclose($handle);
|
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);
|
$zip = new PclZip($archive);
|
||||||
if ($list = $zip->listContent())
|
if ($list = $zip->listContent())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -577,7 +577,7 @@ SELECT
|
|||||||
if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
|
if ($handle = @fopen($archive, 'wb') and fetchRemote($url, $handle, $get_data))
|
||||||
{
|
{
|
||||||
fclose($handle);
|
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);
|
$zip = new PclZip($archive);
|
||||||
if ($list = $zip->listContent())
|
if ($list = $zip->listContent())
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user