From 476915c53fada2827fd381c974973371cc05c832 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 3 Jul 2020 11:20:12 +0200 Subject: [PATCH] Remove --packageID option on cli.php Resolves #3425 --- wcfsetup/install/files/cli.php | 5 +++-- wcfsetup/install/files/lib/system/CLIWCF.class.php | 7 ------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/wcfsetup/install/files/cli.php b/wcfsetup/install/files/cli.php index b367801145..806f136d72 100644 --- a/wcfsetup/install/files/cli.php +++ b/wcfsetup/install/files/cli.php @@ -8,8 +8,9 @@ * @package WoltLabSuite\Core */ if (PHP_SAPI !== 'cli') exit; -// define the wcf-root-dir -define('WCF_DIR', dirname(__FILE__).'/'); + +// include config +require_once(__DIR__.'/app.config.inc.php'); // initiate wcf core require_once(WCF_DIR.'lib/system/WCF.class.php'); diff --git a/wcfsetup/install/files/lib/system/CLIWCF.class.php b/wcfsetup/install/files/lib/system/CLIWCF.class.php index 15353cfae9..9c354faa5a 100644 --- a/wcfsetup/install/files/lib/system/CLIWCF.class.php +++ b/wcfsetup/install/files/lib/system/CLIWCF.class.php @@ -62,13 +62,6 @@ class CLIWCF extends WCF { $zendLoader = new ZendLoader([ZendLoader::AUTOREGISTER_ZF => true]); $zendLoader->register(); - $argv = new ArgvParser([ - 'packageID=i' => '' - ]); - $argv->setOption(ArgvParser::CONFIG_FREEFORM_FLAGS, true); - $argv->parse(); - define('PACKAGE_ID', $argv->packageID ?: 1); - // disable benchmark define('ENABLE_BENCHMARK', 0); -- 2.20.1