Changeset 19168


Ignore:
Timestamp:
Nov 25, 2012, 11:42:16 AM (11 years ago)
Author:
mistic100
Message:

Merged revision(s) r19167 from trunk:
bug:2793 use "include_once" instead of "include" when including pclzip

Location:
branches/2.4/admin/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/2.4/admin/include/languages.class.php

    r16180 r19168  
    320320      {
    321321        fclose($handle);
    322         include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
     322        include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
    323323        $zip = new PclZip($archive);
    324324        if ($list = $zip->listContent())

  • branches/2.4/admin/include/photos_add_direct_process.inc.php

    r15598 r19168  
    8383
    8484        define('PCLZIP_TEMPORARY_DIR', $upload_dir.'/');
    85         include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
     85        include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
    8686        $zip = new PclZip($archive_path);
    8787        if ($list = $zip->listContent())

  • branches/2.4/admin/include/plugins.class.php

    r16180 r19168  
    461461      {
    462462        fclose($handle);
    463         include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
     463        include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
    464464        $zip = new PclZip($archive);
    465465        if ($list = $zip->listContent())

  • branches/2.4/admin/include/themes.class.php

    r16180 r19168  
    578578      {
    579579        fclose($handle);
    580         include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
     580        include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
    581581        $zip = new PclZip($archive);
    582582        if ($list = $zip->listContent())
Note: See TracChangeset for help on using the changeset viewer.