X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=maintenance%2FpopulateContentModel.php;h=e6f47d1aa13ecb5001ac44b8592a57e32e593cea;hb=9dcd12714e1dd761a62d68520ea6f4a370b4b735;hp=7cc829d99e9fbe22f455d38c802ba585583ee439;hpb=c9be16a35596ff369bb5f700c20ae8dc2f7def48;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateContentModel.php b/maintenance/populateContentModel.php
index 7cc829d99e..e6f47d1aa1 100644
--- a/maintenance/populateContentModel.php
+++ b/maintenance/populateContentModel.php
@@ -51,7 +51,7 @@ class PopulateContentModel extends Maintenance {
 
 		$ns = $this->getOption( 'ns' );
 		if ( !ctype_digit( $ns ) && $ns !== 'all' ) {
-			$this->error( 'Invalid namespace', 1 );
+			$this->fatalError( 'Invalid namespace' );
 		}
 		$ns = $ns === 'all' ? 'all' : (int)$ns;
 		$table = $this->getOption( 'table' );
@@ -64,7 +64,7 @@ class PopulateContentModel extends Maintenance {
 				$this->populatePage( $dbw, $ns );
 				break;
 			default:
-				$this->error( "Invalid table name: $table", 1 );
+				$this->fatalError( "Invalid table name: $table" );
 		}
 	}
 
@@ -160,7 +160,7 @@ class PopulateContentModel extends Maintenance {
 		} else { // revision
 			$selectTables = [ 'revision', 'page' ];
 			$fields = [ 'page_title', 'page_namespace' ];
-			$join_conds = [ 'page' => [ 'INNER JOIN', 'rev_page=page_id' ] ];
+			$join_conds = [ 'page' => [ 'JOIN', 'rev_page=page_id' ] ];
 			$where = $ns === 'all' ? [] : [ 'page_namespace' => $ns ];
 			$page_id_column = 'rev_page';
 			$rev_id_column = 'rev_id';
@@ -250,5 +250,5 @@ class PopulateContentModel extends Maintenance {
 	}
 }
 
-$maintClass = 'PopulateContentModel';
+$maintClass = PopulateContentModel::class;
 require_once RUN_MAINTENANCE_IF_MAIN;