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
Skin: Hard deprecate escapeSearchLink()
[lhc/web/wiklou.git]
/
includes
/
skins
/
SkinTemplate.php
diff --git
a/includes/skins/SkinTemplate.php
b/includes/skins/SkinTemplate.php
index
a7b7569
..
5d6197e
100644
(file)
--- a/
includes/skins/SkinTemplate.php
+++ b/
includes/skins/SkinTemplate.php
@@
-207,21
+207,10
@@
class SkinTemplate extends Skin {
}
/**
}
/**
- * initialize various variables and generate the template
- *
- * @param OutputPage|null $out
+ * Initialize various variables and generate the template
*/
*/
- function outputPage(
OutputPage $out = null
) {
+ function outputPage() {
Profiler::instance()->setTemplated( true );
Profiler::instance()->setTemplated( true );
-
- $oldContext = null;
- if ( $out !== null ) {
- // Deprecated since 1.20, note added in 1.25
- wfDeprecated( __METHOD__, '1.25' );
- $oldContext = $this->getContext();
- $this->setContext( $out->getContext() );
- }
-
$out = $this->getOutput();
$this->initPage( $out );
$out = $this->getOutput();
$this->initPage( $out );
@@
-231,10
+220,6
@@
class SkinTemplate extends Skin {
// result may be an error
$this->printOrError( $res );
// result may be an error
$this->printOrError( $res );
-
- if ( $oldContext ) {
- $this->setContext( $oldContext );
- }
}
/**
}
/**
@@
-332,7
+317,7
@@
class SkinTemplate extends Skin {
$tpl->set( 'handheld', $request->getBool( 'handheld' ) );
$tpl->set( 'loggedin', $this->loggedin );
$tpl->set( 'notspecialpage', !$title->isSpecialPage() );
$tpl->set( 'handheld', $request->getBool( 'handheld' ) );
$tpl->set( 'loggedin', $this->loggedin );
$tpl->set( 'notspecialpage', !$title->isSpecialPage() );
- $tpl->set( 'searchaction', $this->
escape
SearchLink() );
+ $tpl->set( 'searchaction', $this->
get
SearchLink() );
$tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBkey() );
$tpl->set( 'search', trim( $request->getVal( 'search' ) ) );
$tpl->set( 'stylepath', $wgStylePath );
$tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBkey() );
$tpl->set( 'search', trim( $request->getVal( 'search' ) ) );
$tpl->set( 'stylepath', $wgStylePath );