dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Use https://www.php.net/ instead of https://secure.php.net/"
[lhc/web/wiklou.git]
/
maintenance
/
populateContentModel.php
diff --git
a/maintenance/populateContentModel.php
b/maintenance/populateContentModel.php
index
7cc829d
..
e6f47d1
100644
(file)
--- 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' ) {
$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' );
}
$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->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' ];
} 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';
$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;
require_once RUN_MAINTENANCE_IF_MAIN;