X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpopulateCategory.php;h=ce1506ca49d3e4287fec8d4f138208c1166faea7;hb=e8805741ed75a6f1fec01bc39962af75e6111c1c;hp=5a8ef90c0cf8cc5f5e4863a140d20b982abff702;hpb=920c06e42c307fcaea47d9b65e09303aded2d1c9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateCategory.php b/maintenance/populateCategory.php
index 5a8ef90c0c..ce1506ca49 100644
--- a/maintenance/populateCategory.php
+++ b/maintenance/populateCategory.php
@@ -71,7 +71,7 @@ TEXT
 	public function execute() {
 		$begin = $this->getOption( 'begin', '' );
 		$throttle = $this->getOption( 'throttle', 0 );
-		$force = $this->getOption( 'force', false );
+		$force = $this->hasOption( 'force' );
 
 		$dbw = $this->getDB( DB_MASTER );
 
@@ -79,7 +79,7 @@ TEXT
 			$row = $dbw->selectRow(
 				'updatelog',
 				'1',
-				array( 'ul_key' => 'populate category' ),
+				[ 'ul_key' => 'populate category' ],
 				__METHOD__
 			);
 			if ( $row ) {
@@ -93,9 +93,9 @@ TEXT
 
 		$throttle = intval( $throttle );
 		if ( $begin !== '' ) {
-			$where = 'cl_to > ' . $dbw->addQuotes( $begin );
+			$where = [ 'cl_to > ' . $dbw->addQuotes( $begin ) ];
 		} else {
-			$where = null;
+			$where = [ '1 = 1' ];
 		}
 		$i = 0;
 
@@ -106,9 +106,9 @@ TEXT
 				'cl_to',
 				$where,
 				__METHOD__,
-				array(
+				[
 					'ORDER BY' => 'cl_to'
-				)
+				]
 			);
 			if ( !$row ) {
 				# Done, hopefully.
@@ -133,22 +133,16 @@ TEXT
 			usleep( $throttle * 1000 );
 		}
 
-		if ( $dbw->insert(
+		$dbw->insert(
 			'updatelog',
-			array( 'ul_key' => 'populate category' ),
+			[ 'ul_key' => 'populate category' ],
 			__METHOD__,
 			'IGNORE'
-		) ) {
-			$this->output( "Category population complete.\n" );
-
-			return true;
-		} else {
-			$this->output( "Could not insert category population row.\n" );
+		);
 
-			return false;
-		}
+		return true;
 	}
 }
 
-$maintClass = "PopulateCategory";
+$maintClass = PopulateCategory::class;
 require_once RUN_MAINTENANCE_IF_MAIN;