From 1f45d60a3cec8aeb0edbc24b4fc211c2974b578d Mon Sep 17 00:00:00 2001 From: Patrick Allaert Date: Wed, 17 Apr 2013 12:39:29 +0200 Subject: [PATCH] Fixed EZP-20718: autoload.php processed/included more than once --- bin/php/adddefaultstates.php | 2 +- bin/php/changelog2xmltext.php | 2 +- bin/php/checkdbfiles.php | 2 +- bin/php/cleanupversions.php | 2 +- bin/php/clusterize.php | 2 +- bin/php/clusterpurge.php | 2 +- bin/php/convertezenumtoezselection.php | 2 +- bin/php/convertprice2multiprice.php | 2 +- bin/php/dfscleanup.php | 2 +- bin/php/ezapplytemplate.php | 2 +- bin/php/ezasynchronouspublisher.php | 2 +- bin/php/ezcache.php | 2 +- bin/php/ezcheckphptag.php | 2 +- bin/php/ezchecktranslation.php | 2 +- bin/php/ezcontentcache.php | 2 +- bin/php/ezconvert2isbn13.php | 2 +- bin/php/ezconvertdbcharset.php | 2 +- bin/php/ezconvertmysqltabletype.php | 2 +- bin/php/ezcsvexport.php | 2 +- bin/php/ezcsvimport.php | 2 +- bin/php/ezexec.php | 2 +- bin/php/ezflowupgrade.php | 2 +- bin/php/ezgeneratetranslationcache.php | 2 +- bin/php/ezimportdbafile.php | 2 +- bin/php/ezpublishingbenchmark.php | 2 +- bin/php/ezsessiongc.php | 2 +- bin/php/ezsqldiff.php | 2 +- bin/php/ezsqldumpisbndata.php | 2 +- bin/php/ezsqldumpschema.php | 2 +- bin/php/ezsqlinsertschema.php | 2 +- bin/php/ezsubtreecopy.php | 2 +- bin/php/ezsubtreeremove.php | 2 +- bin/php/eztc.php | 2 +- bin/php/eztemplatecheck.php | 2 +- bin/php/ezwebininstall.php | 2 +- bin/php/ezwebinupgrade.php | 2 +- bin/php/flatten.php | 2 +- bin/php/makestaticcache.php | 2 +- bin/php/publish_content.php | 2 +- bin/php/trashpurge.php | 2 +- bin/php/updateisbn13.php | 2 +- bin/php/updateniceurls.php | 2 +- bin/php/updatesearchindex.php | 2 +- runcronjobs.php | 2 +- update/common/scripts/cleanup.php | 2 +- update/common/scripts/updatecontentobjectname.php | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/bin/php/adddefaultstates.php b/bin/php/adddefaultstates.php index bf3be04e56c..8283a2fc1e7 100644 --- a/bin/php/adddefaultstates.php +++ b/bin/php/adddefaultstates.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); diff --git a/bin/php/changelog2xmltext.php b/bin/php/changelog2xmltext.php index d9cd4ddcd09..4a43124b15d 100755 --- a/bin/php/changelog2xmltext.php +++ b/bin/php/changelog2xmltext.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Changelog converter\n\n" . diff --git a/bin/php/checkdbfiles.php b/bin/php/checkdbfiles.php index bfac314c0ea..868d8a0a2d6 100755 --- a/bin/php/checkdbfiles.php +++ b/bin/php/checkdbfiles.php @@ -10,7 +10,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish DB file verifier\n\n" . diff --git a/bin/php/cleanupversions.php b/bin/php/cleanupversions.php index 267b4cef9c3..4782eabd828 100755 --- a/bin/php/cleanupversions.php +++ b/bin/php/cleanupversions.php @@ -10,7 +10,7 @@ * @package */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); diff --git a/bin/php/clusterize.php b/bin/php/clusterize.php index fbf74b16519..e78ad635056 100755 --- a/bin/php/clusterize.php +++ b/bin/php/clusterize.php @@ -20,7 +20,7 @@ error_reporting( E_ALL | E_NOTICE ); -require 'autoload.php'; +require_once 'autoload.php'; // This code is taken from eZBinaryFile::storedFileInfo() function filePathForBinaryFile($fileName, $mimeType ) diff --git a/bin/php/clusterpurge.php b/bin/php/clusterpurge.php index d512d5c4e27..26635383f32 100644 --- a/bin/php/clusterpurge.php +++ b/bin/php/clusterpurge.php @@ -8,7 +8,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish cluster files purge\n" . diff --git a/bin/php/convertezenumtoezselection.php b/bin/php/convertezenumtoezselection.php index 39f0b261db7..2f43805ea0f 100755 --- a/bin/php/convertezenumtoezselection.php +++ b/bin/php/convertezenumtoezselection.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); diff --git a/bin/php/convertprice2multiprice.php b/bin/php/convertprice2multiprice.php index 921823b801d..d144a9ba0e8 100755 --- a/bin/php/convertprice2multiprice.php +++ b/bin/php/convertprice2multiprice.php @@ -21,7 +21,7 @@ // script initializing -require 'autoload.php'; +require_once 'autoload.php'; global $cli; global $currencyList; diff --git a/bin/php/dfscleanup.php b/bin/php/dfscleanup.php index a163341ba6c..9066fdccafa 100644 --- a/bin/php/dfscleanup.php +++ b/bin/php/dfscleanup.php @@ -9,7 +9,7 @@ * @package */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); diff --git a/bin/php/ezapplytemplate.php b/bin/php/ezapplytemplate.php index 8eb609e5480..a752a99c12f 100755 --- a/bin/php/ezapplytemplate.php +++ b/bin/php/ezapplytemplate.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Code Template Generator\n\n" . diff --git a/bin/php/ezasynchronouspublisher.php b/bin/php/ezasynchronouspublisher.php index 6db8e8d59bd..879ccf2acb8 100755 --- a/bin/php/ezasynchronouspublisher.php +++ b/bin/php/ezasynchronouspublisher.php @@ -11,7 +11,7 @@ declare( ticks=1 ); -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); diff --git a/bin/php/ezcache.php b/bin/php/ezcache.php index db8834cbc9a..d0455d005c7 100755 --- a/bin/php/ezcache.php +++ b/bin/php/ezcache.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Cache Handler\n" . diff --git a/bin/php/ezcheckphptag.php b/bin/php/ezcheckphptag.php index 5bedfbc8bda..f923ad00b45 100755 --- a/bin/php/ezcheckphptag.php +++ b/bin/php/ezcheckphptag.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish PHP tag checker\n\n" . diff --git a/bin/php/ezchecktranslation.php b/bin/php/ezchecktranslation.php index fcab5e71b0a..3b7fae405a6 100755 --- a/bin/php/ezchecktranslation.php +++ b/bin/php/ezchecktranslation.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Translation Checker\n\n" . diff --git a/bin/php/ezcontentcache.php b/bin/php/ezcontentcache.php index 16304f582ee..02a8e1ff8c7 100755 --- a/bin/php/ezcontentcache.php +++ b/bin/php/ezcontentcache.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Content Cache Handler\n" . diff --git a/bin/php/ezconvert2isbn13.php b/bin/php/ezconvert2isbn13.php index 0594dbd0b81..aa2072e8222 100755 --- a/bin/php/ezconvert2isbn13.php +++ b/bin/php/ezconvert2isbn13.php @@ -37,7 +37,7 @@ set_time_limit( 0 ); -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish ISBN-10 to ISBN-13 converter\n\n" . diff --git a/bin/php/ezconvertdbcharset.php b/bin/php/ezconvertdbcharset.php index 7d3d993e51c..ed85f5878c0 100755 --- a/bin/php/ezconvertdbcharset.php +++ b/bin/php/ezconvertdbcharset.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; diff --git a/bin/php/ezconvertmysqltabletype.php b/bin/php/ezconvertmysqltabletype.php index 4ef3dff5868..eb7cb8d418b 100755 --- a/bin/php/ezconvertmysqltabletype.php +++ b/bin/php/ezconvertmysqltabletype.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Database Converter\n\n" . diff --git a/bin/php/ezcsvexport.php b/bin/php/ezcsvexport.php index dbdebd9198d..5b7efbedd05 100755 --- a/bin/php/ezcsvexport.php +++ b/bin/php/ezcsvexport.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish CSV export script\n" . diff --git a/bin/php/ezcsvimport.php b/bin/php/ezcsvimport.php index 59d0f7abe19..ff1d4f3c452 100755 --- a/bin/php/ezcsvimport.php +++ b/bin/php/ezcsvimport.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish CSV import script\n\n" . diff --git a/bin/php/ezexec.php b/bin/php/ezexec.php index 18fa0a5483a..b96b6157657 100755 --- a/bin/php/ezexec.php +++ b/bin/php/ezexec.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Script Executor\n\n" . diff --git a/bin/php/ezflowupgrade.php b/bin/php/ezflowupgrade.php index 956af73abc4..a0fba0ce0ee 100755 --- a/bin/php/ezflowupgrade.php +++ b/bin/php/ezflowupgrade.php @@ -24,7 +24,7 @@ /*! includes */ -require 'autoload.php'; +require_once 'autoload.php'; include_once( 'bin/php/ezwebincommon.php' ); diff --git a/bin/php/ezgeneratetranslationcache.php b/bin/php/ezgeneratetranslationcache.php index adc67a1cade..b0611e8e7ee 100755 --- a/bin/php/ezgeneratetranslationcache.php +++ b/bin/php/ezgeneratetranslationcache.php @@ -17,7 +17,7 @@ * script initializing * ***************************************************************/ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "\n" . diff --git a/bin/php/ezimportdbafile.php b/bin/php/ezimportdbafile.php index efbdd09be1b..ebd4356fa6f 100755 --- a/bin/php/ezimportdbafile.php +++ b/bin/php/ezimportdbafile.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish datatype sql update\n\n" . diff --git a/bin/php/ezpublishingbenchmark.php b/bin/php/ezpublishingbenchmark.php index 6f27c8202aa..3869b1a70e7 100755 --- a/bin/php/ezpublishingbenchmark.php +++ b/bin/php/ezpublishingbenchmark.php @@ -18,7 +18,7 @@ */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => "eZ Publish Parallel publishing benchmark", diff --git a/bin/php/ezsessiongc.php b/bin/php/ezsessiongc.php index ad7c8c9f3b7..f09f3f1f4c6 100644 --- a/bin/php/ezsessiongc.php +++ b/bin/php/ezsessiongc.php @@ -11,7 +11,7 @@ set_time_limit( 0 ); -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Session Garbage Collector\n\n" . diff --git a/bin/php/ezsqldiff.php b/bin/php/ezsqldiff.php index 6999b75eea9..590e0137882 100755 --- a/bin/php/ezsqldiff.php +++ b/bin/php/ezsqldiff.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish SQL diff\n\n" . diff --git a/bin/php/ezsqldumpisbndata.php b/bin/php/ezsqldumpisbndata.php index b22e6016a0d..f64eb8a1d91 100755 --- a/bin/php/ezsqldumpisbndata.php +++ b/bin/php/ezsqldumpisbndata.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $fileNameDba = 'db_data.dba'; $fileNameSql = 'cleandata.sql'; diff --git a/bin/php/ezsqldumpschema.php b/bin/php/ezsqldumpschema.php index 5929aa43cdc..2a508dbbd0d 100755 --- a/bin/php/ezsqldumpschema.php +++ b/bin/php/ezsqldumpschema.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish SQL Schema dump\n\n" . diff --git a/bin/php/ezsqlinsertschema.php b/bin/php/ezsqlinsertschema.php index 8368d878bf2..bee5aaf9b93 100755 --- a/bin/php/ezsqlinsertschema.php +++ b/bin/php/ezsqlinsertschema.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish SQL Schema insert\n\n" . diff --git a/bin/php/ezsubtreecopy.php b/bin/php/ezsubtreecopy.php index 462bb0c9ff9..afe26bb70c3 100755 --- a/bin/php/ezsubtreecopy.php +++ b/bin/php/ezsubtreecopy.php @@ -13,7 +13,7 @@ // file bin/php/ezsubtreecopy.php // script initializing -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "\n" . diff --git a/bin/php/ezsubtreeremove.php b/bin/php/ezsubtreeremove.php index e8fb90ab6a8..65ba7ddeaf0 100755 --- a/bin/php/ezsubtreeremove.php +++ b/bin/php/ezsubtreeremove.php @@ -13,7 +13,7 @@ // file bin/php/ezsubtreeremove.php // script initializing -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "\n" . diff --git a/bin/php/eztc.php b/bin/php/eztc.php index a0d80d9f710..b81c3b73812 100755 --- a/bin/php/eztc.php +++ b/bin/php/eztc.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Template Compiler\n" . diff --git a/bin/php/eztemplatecheck.php b/bin/php/eztemplatecheck.php index a586e1418bb..6c5763a9b13 100755 --- a/bin/php/eztemplatecheck.php +++ b/bin/php/eztemplatecheck.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish Template Syntax Checker\n" . diff --git a/bin/php/ezwebininstall.php b/bin/php/ezwebininstall.php index af4486aeaf4..5b8470f1533 100755 --- a/bin/php/ezwebininstall.php +++ b/bin/php/ezwebininstall.php @@ -26,7 +26,7 @@ includes */ include_once( 'bin/php/ezwebincommon.php' ); -require 'autoload.php'; +require_once 'autoload.php'; // script initializing $cli = eZCLI::instance(); diff --git a/bin/php/ezwebinupgrade.php b/bin/php/ezwebinupgrade.php index 69ca92f2a93..7fa7c5c0b59 100755 --- a/bin/php/ezwebinupgrade.php +++ b/bin/php/ezwebinupgrade.php @@ -24,7 +24,7 @@ /*! includes */ -require 'autoload.php'; +require_once 'autoload.php'; include_once( 'bin/php/ezwebincommon.php' ); diff --git a/bin/php/flatten.php b/bin/php/flatten.php index bb06b131211..c17bdc0f8f6 100755 --- a/bin/php/flatten.php +++ b/bin/php/flatten.php @@ -11,7 +11,7 @@ set_time_limit( 0 ); -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); diff --git a/bin/php/makestaticcache.php b/bin/php/makestaticcache.php index 22b10c01a00..26b406e54c7 100755 --- a/bin/php/makestaticcache.php +++ b/bin/php/makestaticcache.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish static cache generator\n" . diff --git a/bin/php/publish_content.php b/bin/php/publish_content.php index 073cd897c7a..36443e2111b 100644 --- a/bin/php/publish_content.php +++ b/bin/php/publish_content.php @@ -15,7 +15,7 @@ * @subpackage content */ -require 'autoload.php'; +require_once 'autoload.php'; $pid = getmypid(); diff --git a/bin/php/trashpurge.php b/bin/php/trashpurge.php index 71c4c0caa2d..81d6de92ee0 100644 --- a/bin/php/trashpurge.php +++ b/bin/php/trashpurge.php @@ -9,7 +9,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; $script = eZScript::instance( array( diff --git a/bin/php/updateisbn13.php b/bin/php/updateisbn13.php index e3a3b2445c0..fc0724966fe 100755 --- a/bin/php/updateisbn13.php +++ b/bin/php/updateisbn13.php @@ -16,7 +16,7 @@ * http://www.isbn-international.org/agency?rmxml=1 */ -require 'autoload.php'; +require_once 'autoload.php'; $url = ''; // http://www.isbn-international.org/agency?rmxml=1 url with the xml. diff --git a/bin/php/updateniceurls.php b/bin/php/updateniceurls.php index 3c3b4912beb..355d672e8bf 100755 --- a/bin/php/updateniceurls.php +++ b/bin/php/updateniceurls.php @@ -11,7 +11,7 @@ set_time_limit ( 0 ); -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); $script = eZScript::instance( array( 'description' => ( "eZ Publish url-alias imported and updater.\n\n" . "Will import urls from the older (3.9) system into the new, controlled by the --import* options.\n" . diff --git a/bin/php/updatesearchindex.php b/bin/php/updatesearchindex.php index ea2611b2d8b..e9cae76b5bb 100755 --- a/bin/php/updatesearchindex.php +++ b/bin/php/updatesearchindex.php @@ -11,7 +11,7 @@ set_time_limit( 0 ); -require 'autoload.php'; +require_once 'autoload.php'; $cli = eZCLI::instance(); diff --git a/runcronjobs.php b/runcronjobs.php index 321ecda6745..f5f705566c6 100755 --- a/runcronjobs.php +++ b/runcronjobs.php @@ -22,7 +22,7 @@ date_default_timezone_set( "UTC" ); } -require 'autoload.php'; +require_once 'autoload.php'; require_once( 'kernel/common/i18n.php' ); eZContentLanguage::setCronjobMode(); diff --git a/update/common/scripts/cleanup.php b/update/common/scripts/cleanup.php index b42d1e3c44f..b05176a6303 100755 --- a/update/common/scripts/cleanup.php +++ b/update/common/scripts/cleanup.php @@ -7,7 +7,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; set_time_limit( 0 ); diff --git a/update/common/scripts/updatecontentobjectname.php b/update/common/scripts/updatecontentobjectname.php index 009526ea381..e8bfd110ef2 100755 --- a/update/common/scripts/updatecontentobjectname.php +++ b/update/common/scripts/updatecontentobjectname.php @@ -7,7 +7,7 @@ * @package kernel */ -require 'autoload.php'; +require_once 'autoload.php'; set_time_limit( 0 );