Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed EZP-20718: autoload.php processed/included more than once #607

Merged
merged 1 commit into from
Apr 17, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/php/adddefaultstates.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @package kernel
*/

require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();

Expand Down
2 changes: 1 addition & 1 deletion bin/php/changelog2xmltext.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/checkdbfiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/cleanupversions.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @package
*/

require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();

Expand Down
2 changes: 1 addition & 1 deletion bin/php/clusterize.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion bin/php/clusterpurge.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/convertezenumtoezselection.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @package kernel
*/

require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();

Expand Down
2 changes: 1 addition & 1 deletion bin/php/convertprice2multiprice.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@


// script initializing
require 'autoload.php';
require_once 'autoload.php';

global $cli;
global $currencyList;
Expand Down
2 changes: 1 addition & 1 deletion bin/php/dfscleanup.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @package
*/

require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();

Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezapplytemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezasynchronouspublisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

declare( ticks=1 );

require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();

Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezcheckphptag.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezchecktranslation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezcontentcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezconvert2isbn13.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezconvertdbcharset.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @package kernel
*/

require 'autoload.php';
require_once 'autoload.php';



Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezconvertmysqltabletype.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezcsvexport.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezcsvimport.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezexec.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezflowupgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/*!
includes
*/
require 'autoload.php';
require_once 'autoload.php';
include_once( 'bin/php/ezwebincommon.php' );


Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezgeneratetranslationcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* script initializing *
***************************************************************/

require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();
$script = eZScript::instance( array( 'description' => ( "\n" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezimportdbafile.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezpublishingbenchmark.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/


require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();
$script = eZScript::instance( array( 'description' => "eZ Publish Parallel publishing benchmark",
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezsessiongc.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezsqldiff.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezsqldumpisbndata.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @package kernel
*/

require 'autoload.php';
require_once 'autoload.php';

$fileNameDba = 'db_data.dba';
$fileNameSql = 'cleandata.sql';
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezsqldumpschema.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezsqlinsertschema.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezsubtreecopy.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezsubtreeremove.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/eztc.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/eztemplatecheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezwebininstall.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
includes
*/
include_once( 'bin/php/ezwebincommon.php' );
require 'autoload.php';
require_once 'autoload.php';

// script initializing
$cli = eZCLI::instance();
Expand Down
2 changes: 1 addition & 1 deletion bin/php/ezwebinupgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/*!
includes
*/
require 'autoload.php';
require_once 'autoload.php';
include_once( 'bin/php/ezwebincommon.php' );


Expand Down
2 changes: 1 addition & 1 deletion bin/php/flatten.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

set_time_limit( 0 );

require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();

Expand Down
2 changes: 1 addition & 1 deletion bin/php/makestaticcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/publish_content.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @subpackage content
*/

require 'autoload.php';
require_once 'autoload.php';

$pid = getmypid();

Expand Down
2 changes: 1 addition & 1 deletion bin/php/trashpurge.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @package kernel
*/

require 'autoload.php';
require_once 'autoload.php';

$script = eZScript::instance(
array(
Expand Down
2 changes: 1 addition & 1 deletion bin/php/updateisbn13.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion bin/php/updateniceurls.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
2 changes: 1 addition & 1 deletion bin/php/updatesearchindex.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

set_time_limit( 0 );

require 'autoload.php';
require_once 'autoload.php';

$cli = eZCLI::instance();

Expand Down
2 changes: 1 addition & 1 deletion runcronjobs.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
date_default_timezone_set( "UTC" );
}

require 'autoload.php';
require_once 'autoload.php';
require_once( 'kernel/common/i18n.php' );

eZContentLanguage::setCronjobMode();
Expand Down
Loading