}
function showMergeForm() {
- global $wgScript;
-
$this->getOutput()->addWikiMsg( 'mergehistory-header' );
$this->getOutput()->addHTML(
Xml::openElement( 'form', array(
'method' => 'get',
- 'action' => $wgScript ) ) .
+ 'action' => wfScript() ) ) .
'<fieldset>' .
Xml::element( 'legend', array(),
$this->msg( 'mergehistory-box' )->text() ) .
/**
* Actually attempt the history move
*
- * @todo: if all versions of page A are moved to B and then a user
+ * @todo if all versions of page A are moved to B and then a user
* tries to do a reverse-merge via the "unmerge" log link, then page
* A will still be a redirect (as it was after the original merge),
* though it will have the old revisions back from before (as expected).
* The user may have to "undo" the redirect manually to finish the "unmerge".
* Maybe this should delete redirects at the target page of merges?
*
- * @return boolean Success
+ * @return bool Success
*/
function merge() {
# Get the titles directly from the IDs, in case the target page params
$dbw->insert( 'pagelinks',
array(
'pl_from' => $this->mDestID,
+ 'pl_from_namespace' => $destTitle->getNamespace(),
'pl_namespace' => $destTitle->getNamespace(),
'pl_title' => $destTitle->getDBkey() ),
__METHOD__
array( $destTitle->getPrefixedText(), $timestampLimit ), $this->getUser()
);
- # @TODO: message should use redirect=no
+ # @todo message should use redirect=no
$this->getOutput()->addWikiMsg( 'mergehistory-success',
$targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count );