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
Revert r19877; no reason is given for it but it breaks things such as parameter subst...
[lhc/web/wiklou.git]
/
includes
/
OutputPage.php
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
4ca9e88
..
3fcef0f
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-2,12
+2,10
@@
if ( ! defined( 'MEDIAWIKI' ) )
die( 1 );
/**
if ( ! defined( 'MEDIAWIKI' ) )
die( 1 );
/**
- * @package MediaWiki
*/
/**
* @todo document
*/
/**
* @todo document
- * @package MediaWiki
*/
class OutputPage {
var $mMetatags, $mKeywords;
*/
class OutputPage {
var $mMetatags, $mKeywords;
@@
-34,7
+32,7
@@
class OutputPage {
* Constructor
* Initialise private variables
*/
* Constructor
* Initialise private variables
*/
- function
OutputPage
() {
+ function
__construct
() {
$this->mMetatags = $this->mKeywords = $this->mLinktags = array();
$this->mHTMLtitle = $this->mPagetitle = $this->mBodytext =
$this->mRedirect = $this->mLastModified =
$this->mMetatags = $this->mKeywords = $this->mLinktags = array();
$this->mHTMLtitle = $this->mPagetitle = $this->mBodytext =
$this->mRedirect = $this->mLastModified =
@@
-71,7
+69,7
@@
class OutputPage {
# To add an http-equiv meta tag, precede the name with "http:"
function addMeta( $name, $val ) { array_push( $this->mMetatags, array( $name, $val ) ); }
function addKeyword( $text ) { array_push( $this->mKeywords, $text ); }
# To add an http-equiv meta tag, precede the name with "http:"
function addMeta( $name, $val ) { array_push( $this->mMetatags, array( $name, $val ) ); }
function addKeyword( $text ) { array_push( $this->mKeywords, $text ); }
- function addScript( $script ) { $this->mScripts .= $script; }
+ function addScript( $script ) { $this->mScripts .=
"\t\t".
$script; }
/**
* Add a self-contained script tag with the given contents
/**
* Add a self-contained script tag with the given contents
@@
-254,7
+252,7
@@
class OutputPage {
$lb->setArray( $arr );
$lb->execute();
$lb->setArray( $arr );
$lb->execute();
- $sk =
&
$wgUser->getSkin();
+ $sk = $wgUser->getSkin();
foreach ( $categories as $category => $unused ) {
$title = Title::makeTitleSafe( NS_CATEGORY, $category );
$text = $wgContLang->convertHtml( $title->getText() );
foreach ( $categories as $category => $unused ) {
$title = Title::makeTitleSafe( NS_CATEGORY, $category );
$text = $wgContLang->convertHtml( $title->getText() );
@@
-315,14
+313,26
@@
class OutputPage {
$this->addWikiTextTitle($text, $title, $linestart);
}
$this->addWikiTextTitle($text, $title, $linestart);
}
- private function addWikiTextTitle($text, &$title, $linestart) {
+ function addWikiTextTitleTidy($text, &$title, $linestart = true) {
+ $this->addWikiTextTitle( $text, $title, $linestart, true );
+ }
+
+ public function addWikiTextTitle($text, &$title, $linestart, $tidy = false) {
global $wgParser;
global $wgParser;
+
$fname = 'OutputPage:addWikiTextTitle';
wfProfileIn($fname);
$fname = 'OutputPage:addWikiTextTitle';
wfProfileIn($fname);
+
wfIncrStats('pcache_not_possible');
wfIncrStats('pcache_not_possible');
- $parserOutput = $wgParser->parse( $text, $title, $this->parserOptions(),
+
+ $popts = $this->parserOptions();
+ $popts->setTidy($tidy);
+
+ $parserOutput = $wgParser->parse( $text, $title, $popts,
$linestart, true, $this->mRevisionId );
$linestart, true, $this->mRevisionId );
+
$this->addParserOutput( $parserOutput );
$this->addParserOutput( $parserOutput );
+
wfProfileOut($fname);
}
wfProfileOut($fname);
}
@@
-366,6
+376,7
@@
class OutputPage {
* @param string $text
* @param Article $article
* @param bool $cache
* @param string $text
* @param Article $article
* @param bool $cache
+ * @deprecated Use Article::outputWikitext
*/
public function addPrimaryWikiText( $text, $article, $cache = true ) {
global $wgParser, $wgUser;
*/
public function addPrimaryWikiText( $text, $article, $cache = true ) {
global $wgParser, $wgUser;
@@
-384,17
+395,19
@@
class OutputPage {
}
/**
}
/**
- * For anything that isn't primary text or interface message
- *
- * @param string $text
- * @param bool $linestart Is this the start of a line?
+ * @deprecated use addWikiTextTidy()
*/
public function addSecondaryWikiText( $text, $linestart = true ) {
global $wgTitle;
*/
public function addSecondaryWikiText( $text, $linestart = true ) {
global $wgTitle;
- $popts = $this->parserOptions();
- $popts->setTidy(true);
- $this->addWikiTextTitle($text, $wgTitle, $linestart);
- $popts->setTidy(false);
+ $this->addWikiTextTitleTidy($text, $wgTitle, $linestart);
+ }
+
+ /**
+ * Add wikitext with tidy enabled
+ */
+ public function addWikiTextTidy( $text, $linestart = true ) {
+ global $wgTitle;
+ $this->addWikiTextTitleTidy($text, $wgTitle, $linestart);
}
}
@@
-476,7
+489,7
@@
class OutputPage {
# maintain different caches for logged-in users and non-logged in ones
$wgRequest->response()->header( 'Vary: Accept-Encoding, Cookie' );
if( !$this->uncacheableBecauseRequestvars() && $this->mEnableClientCache ) {
# maintain different caches for logged-in users and non-logged in ones
$wgRequest->response()->header( 'Vary: Accept-Encoding, Cookie' );
if( !$this->uncacheableBecauseRequestvars() && $this->mEnableClientCache ) {
- if( $wgUseSquid &&
! isset( $_COOKIE[ini_get( 'session.name') ] )
&&
+ if( $wgUseSquid &&
session_id() == ''
&&
! $this->isPrintable() && $this->mSquidMaxage != 0 )
{
if ( $wgUseESI ) {
! $this->isPrintable() && $this->mSquidMaxage != 0 )
{
if ( $wgUseESI ) {
@@
-536,13
+549,16
@@
class OutputPage {
if ( $wgUseAjax ) {
$this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajax.js?$wgStyleVersion\"></script>\n" );
if ( $wgUseAjax ) {
$this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajax.js?$wgStyleVersion\"></script>\n" );
+
+ wfRunHooks( 'AjaxAddScript', array( &$this ) );
+
if( $wgAjaxSearch ) {
if( $wgAjaxSearch ) {
- $this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajaxsearch.js\"></script>\n" );
+ $this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajaxsearch.js
?$wgStyleVersion
\"></script>\n" );
$this->addScript( "<script type=\"{$wgJsMimeType}\">hookEvent(\"load\", sajax_onload);</script>\n" );
}
if( $wgAjaxWatch && $wgUser->isLoggedIn() ) {
$this->addScript( "<script type=\"{$wgJsMimeType}\">hookEvent(\"load\", sajax_onload);</script>\n" );
}
if( $wgAjaxWatch && $wgUser->isLoggedIn() ) {
- $this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajaxwatch.js\"></script>\n" );
+ $this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajaxwatch.js
?$wgStyleVersion
\"></script>\n" );
}
}
}
}
@@
-791,7
+807,7
@@
class OutputPage {
$groupName = User::getGroupName( $key );
$groupPage = User::getGroupPage( $key );
if( $groupPage ) {
$groupName = User::getGroupName( $key );
$groupPage = User::getGroupPage( $key );
if( $groupPage ) {
- $skin =
&
$wgUser->getSkin();
+ $skin = $wgUser->getSkin();
$groups[] = '"'.$skin->makeLinkObj( $groupPage, $groupName ).'"';
} else {
$groups[] = '"'.$groupName.'"';
$groups[] = '"'.$skin->makeLinkObj( $groupPage, $groupName ).'"';
} else {
$groups[] = '"'.$groupName.'"';
@@
-880,10
+896,22
@@
class OutputPage {
$this->setPageTitle( wfMsg( 'viewsource' ) );
$this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) );
$this->setPageTitle( wfMsg( 'viewsource' ) );
$this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) );
+ $cascadeSources = $wgTitle->getCascadeProtectionSources();
+
# Determine if protection is due to the page being a system message
# and show an appropriate explanation
# Determine if protection is due to the page being a system message
# and show an appropriate explanation
- if( $wgTitle->getNamespace() == NS_MEDIAWIKI
&& !$wgUser->isAllowed( 'editinterface' )
) {
+ if( $wgTitle->getNamespace() == NS_MEDIAWIKI ) {
$this->addWikiText( wfMsg( 'protectedinterface' ) );
$this->addWikiText( wfMsg( 'protectedinterface' ) );
+ } if ( $cascadeSources && count($cascadeSources) > 0 ) {
+ $titles = '';
+
+ foreach ( $cascadeSources as $title ) {
+ $titles .= '* [[:' . $title->getPrefixedText() . "]]\n";
+ }
+
+ $notice = wfMsg( 'cascadeprotected' ) . "\n$titles";
+
+ $this->addWikiText( $notice );
} else {
$this->addWikiText( wfMsg( 'protectedpagetext' ) );
}
} else {
$this->addWikiText( wfMsg( 'protectedpagetext' ) );
}
@@
-899,17
+927,8
@@
class OutputPage {
if( is_string( $source ) ) {
$this->addWikiText( wfMsg( 'viewsourcetext' ) );
if( is_string( $source ) ) {
$this->addWikiText( wfMsg( 'viewsourcetext' ) );
- if( $source === '' ) {
- global $wgTitle;
- if ( $wgTitle->getNamespace() == NS_MEDIAWIKI ) {
- $source = wfMsgWeirdKey ( $wgTitle->getText() );
- } else {
- $source = '';
- }
- }
$rows = $wgUser->getIntOption( 'rows' );
$cols = $wgUser->getIntOption( 'cols' );
$rows = $wgUser->getIntOption( 'rows' );
$cols = $wgUser->getIntOption( 'cols' );
-
$text = "\n<textarea name='wpTextbox1' id='wpTextbox1' cols='$cols' rows='$rows' readonly='readonly'>" .
htmlspecialchars( $source ) . "\n</textarea>";
$this->addHTML( $text );
$text = "\n<textarea name='wpTextbox1' id='wpTextbox1' cols='$cols' rows='$rows' readonly='readonly'>" .
htmlspecialchars( $source ) . "\n</textarea>";
$this->addHTML( $text );
@@
-1117,11
+1136,11
@@
class OutputPage {
"/<.*?>/" => '',
"/_/" => ' '
);
"/<.*?>/" => '',
"/_/" => ' '
);
- $ret .= "<meta name=\"keywords\" content=\"" .
+ $ret .= "
\t\t
<meta name=\"keywords\" content=\"" .
htmlspecialchars(preg_replace(array_keys($strip), array_values($strip),implode( ",", $this->mKeywords ))) . "\" />\n";
}
foreach ( $this->mLinktags as $tag ) {
htmlspecialchars(preg_replace(array_keys($strip), array_values($strip),implode( ",", $this->mKeywords ))) . "\" />\n";
}
foreach ( $this->mLinktags as $tag ) {
- $ret .=
'<link'
;
+ $ret .=
"\t\t<link"
;
foreach( $tag as $attr => $val ) {
$ret .= " $attr=\"" . htmlspecialchars( $val ) . "\"";
}
foreach( $tag as $attr => $val ) {
$ret .= " $attr=\"" . htmlspecialchars( $val ) . "\"";
}