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 "Add framework for file warnings"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialMergeHistory.php
diff --git
a/includes/specials/SpecialMergeHistory.php
b/includes/specials/SpecialMergeHistory.php
index
7e74cd5
..
368d491
100644
(file)
--- a/
includes/specials/SpecialMergeHistory.php
+++ b/
includes/specials/SpecialMergeHistory.php
@@
-152,16
+152,17
@@
class SpecialMergeHistory extends SpecialPage {
if ( count( $errors ) ) {
$this->showMergeForm();
if ( count( $errors ) ) {
$this->showMergeForm();
- $
this->getOutput()
->addHTML( implode( "\n", $errors ) );
+ $
out
->addHTML( implode( "\n", $errors ) );
} else {
$this->showHistory();
}
}
function showMergeForm() {
} else {
$this->showHistory();
}
}
function showMergeForm() {
- $this->getOutput()->addWikiMsg( 'mergehistory-header' );
+ $out = $this->getOutput();
+ $out->addWikiMsg( 'mergehistory-header' );
- $
this->getOutput()
->addHTML(
+ $
out
->addHTML(
Xml::openElement( 'form', array(
'method' => 'get',
'action' => wfScript() ) ) .
Xml::openElement( 'form', array(
'method' => 'get',
'action' => wfScript() ) ) .
@@
-185,6
+186,8
@@
class SpecialMergeHistory extends SpecialPage {
'</fieldset>' .
'</form>'
);
'</fieldset>' .
'</form>'
);
+
+ $out->addHelpLink( 'Help:Merge history' );
}
private function showHistory() {
}
private function showHistory() {