dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df036ed
)
revert r106095, fix apparently not this simple
author
Jeroen De Dauw
<jeroendedauw@users.mediawiki.org>
Tue, 13 Dec 2011 21:34:16 +0000
(21:34 +0000)
committer
Jeroen De Dauw
<jeroendedauw@users.mediawiki.org>
Tue, 13 Dec 2011 21:34:16 +0000
(21:34 +0000)
includes/Article.php
patch
|
blob
|
history
includes/ChangesList.php
patch
|
blob
|
history
includes/FileDeleteForm.php
patch
|
blob
|
history
includes/LogPage.php
patch
|
blob
|
history
includes/ProtectionForm.php
patch
|
blob
|
history
includes/specials/SpecialMergeHistory.php
patch
|
blob
|
history
includes/specials/SpecialMovepage.php
patch
|
blob
|
history
includes/specials/SpecialRevisiondelete.php
patch
|
blob
|
history
includes/specials/SpecialUserrights.php
patch
|
blob
|
history
diff --git
a/includes/Article.php
b/includes/Article.php
index
a3e5590
..
80ae240
100644
(file)
--- a/
includes/Article.php
+++ b/
includes/Article.php
@@
-1276,7
+1276,7
@@
class Article extends Page {
$wgOut->wrapWikiMsg( "<div class=\"error mw-error-cannotdelete\">\n$1\n</div>",
array( 'cannotdelete', wfEscapeWikiText( $title->getPrefixedText() ) )
);
$wgOut->wrapWikiMsg( "<div class=\"error mw-error-cannotdelete\">\n$1\n</div>",
array( 'cannotdelete', wfEscapeWikiText( $title->getPrefixedText() ) )
);
- $wgOut->addHTML( Xml::element( 'h2', null, LogPage::
get
Name( 'delete' ) ) );
+ $wgOut->addHTML( Xml::element( 'h2', null, LogPage::
log
Name( 'delete' ) ) );
LogEventsList::showLogExtract(
$wgOut,
'delete',
LogEventsList::showLogExtract(
$wgOut,
'delete',
@@
-1456,7
+1456,7
@@
class Article extends Page {
}
$wgOut->addHTML( $form );
}
$wgOut->addHTML( $form );
- $wgOut->addHTML( Xml::element( 'h2', null, LogPage::
get
Name( 'delete' ) ) );
+ $wgOut->addHTML( Xml::element( 'h2', null, LogPage::
log
Name( 'delete' ) ) );
LogEventsList::showLogExtract( $wgOut, 'delete',
$this->getTitle()->getPrefixedText()
);
LogEventsList::showLogExtract( $wgOut, 'delete',
$this->getTitle()->getPrefixedText()
);
@@
-1489,7
+1489,7
@@
class Article extends Page {
$wgOut->wrapWikiMsg( "<div class=\"error mw-error-cannotdelete\">\n$1\n</div>",
array( 'cannotdelete', wfEscapeWikiText( $this->getTitle()->getPrefixedText() ) )
);
$wgOut->wrapWikiMsg( "<div class=\"error mw-error-cannotdelete\">\n$1\n</div>",
array( 'cannotdelete', wfEscapeWikiText( $this->getTitle()->getPrefixedText() ) )
);
- $wgOut->addHTML( Xml::element( 'h2', null, LogPage::
get
Name( 'delete' ) ) );
+ $wgOut->addHTML( Xml::element( 'h2', null, LogPage::
log
Name( 'delete' ) ) );
LogEventsList::showLogExtract(
$wgOut,
LogEventsList::showLogExtract(
$wgOut,
diff --git
a/includes/ChangesList.php
b/includes/ChangesList.php
index
f2d10e1
..
32a8d47
100644
(file)
--- a/
includes/ChangesList.php
+++ b/
includes/ChangesList.php
@@
-666,7
+666,7
@@
class EnhancedChangesList extends ChangesList {
if( $logType ) {
$logtitle = SpecialPage::getTitleFor( 'Log', $logType );
$clink = '(' . Linker::linkKnown( $logtitle,
if( $logType ) {
$logtitle = SpecialPage::getTitleFor( 'Log', $logType );
$clink = '(' . Linker::linkKnown( $logtitle,
- LogPage::
get
Name( $logType ) ) . ')';
+ LogPage::
log
Name( $logType ) ) . ')';
} else {
$clink = Linker::link( $rc->getTitle() );
}
} else {
$clink = Linker::link( $rc->getTitle() );
}
@@
-676,7
+676,7
@@
class EnhancedChangesList extends ChangesList {
list( $specialName, $logtype ) = SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] );
if ( $specialName == 'Log' ) {
# Log updates, etc
list( $specialName, $logtype ) = SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] );
if ( $specialName == 'Log' ) {
# Log updates, etc
- $logname = LogPage::
get
Name( $logtype );
+ $logname = LogPage::
log
Name( $logtype );
$clink = '(' . Linker::linkKnown( $rc->getTitle(), $logname ) . ')';
} else {
wfDebug( "Unexpected special page in recentchanges\n" );
$clink = '(' . Linker::linkKnown( $rc->getTitle(), $logname ) . ')';
} else {
wfDebug( "Unexpected special page in recentchanges\n" );
@@
-1124,7
+1124,7
@@
class EnhancedChangesList extends ChangesList {
# Article or log link
if( $logType ) {
$logtitle = SpecialPage::getTitleFor( 'Log', $logType );
# Article or log link
if( $logType ) {
$logtitle = SpecialPage::getTitleFor( 'Log', $logType );
- $logname = LogPage::
get
Name( $logType );
+ $logname = LogPage::
log
Name( $logType );
$r .= '(' . Linker::linkKnown( $logtitle, htmlspecialchars( $logname ) ) . ')';
} else {
$this->insertArticleLink( $r, $rcObj, $rcObj->unpatrolled, $rcObj->watched );
$r .= '(' . Linker::linkKnown( $logtitle, htmlspecialchars( $logname ) ) . ')';
} else {
$this->insertArticleLink( $r, $rcObj, $rcObj->unpatrolled, $rcObj->watched );
diff --git
a/includes/FileDeleteForm.php
b/includes/FileDeleteForm.php
index
fcf4105
..
eedb68e
100644
(file)
--- a/
includes/FileDeleteForm.php
+++ b/
includes/FileDeleteForm.php
@@
-258,7
+258,7
@@
class FileDeleteForm {
*/
private function showLogEntries() {
global $wgOut;
*/
private function showLogEntries() {
global $wgOut;
- $wgOut->addHTML( '<h2>' . htmlspecialchars( LogPage::
get
Name( 'delete' ) ) . "</h2>\n" );
+ $wgOut->addHTML( '<h2>' . htmlspecialchars( LogPage::
log
Name( 'delete' ) ) . "</h2>\n" );
LogEventsList::showLogExtract( $wgOut, 'delete', $this->title );
}
LogEventsList::showLogExtract( $wgOut, 'delete', $this->title );
}
diff --git
a/includes/LogPage.php
b/includes/LogPage.php
index
454f935
..
a6cf3d3
100644
(file)
--- a/
includes/LogPage.php
+++ b/
includes/LogPage.php
@@
-195,7
+195,7
@@
class LogPage {
* @deprecated in 1.19, warnings in 1.21. Use getDescription()
*/
public static function logHeader( $type ) {
* @deprecated in 1.19, warnings in 1.21. Use getDescription()
*/
public static function logHeader( $type ) {
- wfDeprecated( __METHOD__, '1.19' );
+
#
wfDeprecated( __METHOD__, '1.19' );
global $wgLogHeaders;
return wfMsgExt( $wgLogHeaders[$type], array( 'parseinline' ) );
}
global $wgLogHeaders;
return wfMsgExt( $wgLogHeaders[$type], array( 'parseinline' ) );
}
@@
-398,7
+398,7
@@
class LogPage {
# Use the language name for log titles, rather than Log/X
if( $name == 'Log' ) {
# Use the language name for log titles, rather than Log/X
if( $name == 'Log' ) {
- $titleLink = '(' . Linker::link( $title, LogPage::
get
Name( $par ) ) . ')';
+ $titleLink = '(' . Linker::link( $title, LogPage::
log
Name( $par ) ) . ')';
} else {
$titleLink = Linker::link( $title );
}
} else {
$titleLink = Linker::link( $title );
}
diff --git
a/includes/ProtectionForm.php
b/includes/ProtectionForm.php
index
e8ca054
..
caa949d
100644
(file)
--- a/
includes/ProtectionForm.php
+++ b/
includes/ProtectionForm.php
@@
-609,7
+609,7
@@
class ProtectionForm {
*/
function showLogExtract( &$out ) {
# Show relevant lines from the protection log:
*/
function showLogExtract( &$out ) {
# Show relevant lines from the protection log:
- $out->addHTML( Xml::element( 'h2', null, LogPage::
get
Name( 'protect' ) ) );
+ $out->addHTML( Xml::element( 'h2', null, LogPage::
log
Name( 'protect' ) ) );
LogEventsList::showLogExtract( $out, 'protect', $this->mTitle );
# Let extensions add other relevant log extracts
wfRunHooks( 'ProtectionForm::showLogExtract', array($this->mArticle,$out) );
LogEventsList::showLogExtract( $out, 'protect', $this->mTitle );
# Let extensions add other relevant log extracts
wfRunHooks( 'ProtectionForm::showLogExtract', array($this->mArticle,$out) );
diff --git
a/includes/specials/SpecialMergeHistory.php
b/includes/specials/SpecialMergeHistory.php
index
5c6266b
..
19650da
100644
(file)
--- a/
includes/specials/SpecialMergeHistory.php
+++ b/
includes/specials/SpecialMergeHistory.php
@@
-226,7
+226,7
@@
class SpecialMergeHistory extends SpecialPage {
}
# Show relevant lines from the deletion log:
}
# Show relevant lines from the deletion log:
- $out->addHTML( '<h2>' . htmlspecialchars( LogPage::
get
Name( 'merge' ) ) . "</h2>\n" );
+ $out->addHTML( '<h2>' . htmlspecialchars( LogPage::
log
Name( 'merge' ) ) . "</h2>\n" );
LogEventsList::showLogExtract( $out, 'merge', $this->mTargetObj );
# When we submit, go by page ID to avoid some nasty but unlikely collisions.
LogEventsList::showLogExtract( $out, 'merge', $this->mTargetObj );
# When we submit, go by page ID to avoid some nasty but unlikely collisions.
diff --git
a/includes/specials/SpecialMovepage.php
b/includes/specials/SpecialMovepage.php
index
6a1985c
..
5eb0247
100644
(file)
--- a/
includes/specials/SpecialMovepage.php
+++ b/
includes/specials/SpecialMovepage.php
@@
-588,7
+588,7
@@
class MovePageForm extends UnlistedSpecialPage {
function showLogFragment( $title ) {
$out = $this->getOutput();
function showLogFragment( $title ) {
$out = $this->getOutput();
- $out->addHTML( Xml::element( 'h2', null, LogPage::
get
Name( 'move' ) ) );
+ $out->addHTML( Xml::element( 'h2', null, LogPage::
log
Name( 'move' ) ) );
LogEventsList::showLogExtract( $out, 'move', $title );
}
LogEventsList::showLogExtract( $out, 'move', $title );
}
diff --git
a/includes/specials/SpecialRevisiondelete.php
b/includes/specials/SpecialRevisiondelete.php
index
d307e09
..
dce79d3
100644
(file)
--- a/
includes/specials/SpecialRevisiondelete.php
+++ b/
includes/specials/SpecialRevisiondelete.php
@@
-201,12
+201,12
@@
class SpecialRevisionDelete extends UnlistedSpecialPage {
$qc = $this->getLogQueryCond();
# Show relevant lines from the deletion log
$qc = $this->getLogQueryCond();
# Show relevant lines from the deletion log
- $output->addHTML( "<h2>" . htmlspecialchars( LogPage::
get
Name( 'delete' ) ) . "</h2>\n" );
+ $output->addHTML( "<h2>" . htmlspecialchars( LogPage::
log
Name( 'delete' ) ) . "</h2>\n" );
LogEventsList::showLogExtract( $output, 'delete',
$this->targetObj, '', array( 'lim' => 25, 'conds' => $qc ) );
# Show relevant lines from the suppression log
if( $user->isAllowed( 'suppressionlog' ) ) {
LogEventsList::showLogExtract( $output, 'delete',
$this->targetObj, '', array( 'lim' => 25, 'conds' => $qc ) );
# Show relevant lines from the suppression log
if( $user->isAllowed( 'suppressionlog' ) ) {
- $output->addHTML( "<h2>" . htmlspecialchars( LogPage::
get
Name( 'suppress' ) ) . "</h2>\n" );
+ $output->addHTML( "<h2>" . htmlspecialchars( LogPage::
log
Name( 'suppress' ) ) . "</h2>\n" );
LogEventsList::showLogExtract( $output, 'suppress',
$this->targetObj, '', array( 'lim' => 25, 'conds' => $qc ) );
}
LogEventsList::showLogExtract( $output, 'suppress',
$this->targetObj, '', array( 'lim' => 25, 'conds' => $qc ) );
}
diff --git
a/includes/specials/SpecialUserrights.php
b/includes/specials/SpecialUserrights.php
index
710ec1e
..
100d5c1
100644
(file)
--- a/
includes/specials/SpecialUserrights.php
+++ b/
includes/specials/SpecialUserrights.php
@@
-600,7
+600,7
@@
class UserrightsPage extends SpecialPage {
* @param $output OutputPage to use
*/
protected function showLogFragment( $user, $output ) {
* @param $output OutputPage to use
*/
protected function showLogFragment( $user, $output ) {
- $output->addHTML( Xml::element( 'h2', null, LogPage::
get
Name( 'rights' ) . "\n" ) );
+ $output->addHTML( Xml::element( 'h2', null, LogPage::
log
Name( 'rights' ) . "\n" ) );
LogEventsList::showLogExtract( $output, 'rights', $user->getUserPage() );
}
}
LogEventsList::showLogExtract( $output, 'rights', $user->getUserPage() );
}
}