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 "(bug 260) Handle <pre> overflow automatically with a scroll bar"
[lhc/web/wiklou.git]
/
includes
/
OutputPage.php
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
c00cfbe
..
1b4bc49
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-36,10
+36,10
@@
* @todo document
*/
class OutputPage extends ContextSource {
* @todo document
*/
class OutputPage extends ContextSource {
- /// Should be private. Used with addMeta() which adds
<meta>
+ /// Should be private. Used with addMeta() which adds
"<meta>"
var $mMetatags = array();
var $mMetatags = array();
- ///
<meta keywords="stuff">
most of the time the first 10 links to an article
+ ///
"<meta keywords='stuff'>"
most of the time the first 10 links to an article
var $mKeywords = array();
var $mLinktags = array();
var $mKeywords = array();
var $mLinktags = array();
@@
-50,7
+50,7
@@
class OutputPage extends ContextSource {
/// Should be private - has getter and setter. Contains the HTML title
var $mPagetitle = '';
/// Should be private - has getter and setter. Contains the HTML title
var $mPagetitle = '';
- /// Contains all of the
<body>
content. Should be private we got set/get accessors and the append() method.
+ /// Contains all of the
"<body>"
content. Should be private we got set/get accessors and the append() method.
var $mBodytext = '';
/**
var $mBodytext = '';
/**
@@
-60,7
+60,7
@@
class OutputPage extends ContextSource {
*/
public $mDebugtext = ''; // TODO: we might want to replace it by wfDebug() wfDebugLog()
*/
public $mDebugtext = ''; // TODO: we might want to replace it by wfDebug() wfDebugLog()
- /// Should be private. Stores contents of
<title>
tag
+ /// Should be private. Stores contents of
"<title>"
tag
var $mHTMLtitle = '';
/// Should be private. Is the displayed content related to the source of the corresponding wiki article.
var $mHTMLtitle = '';
/// Should be private. Is the displayed content related to the source of the corresponding wiki article.
@@
-116,8
+116,8
@@
class OutputPage extends ContextSource {
/**
* Should be private. Used for JavaScript (pre resource loader)
* We should split js / css.
/**
* Should be private. Used for JavaScript (pre resource loader)
* We should split js / css.
- * mScripts content is inserted as is in
<head> by Skin. This might contains
- * either a link to a stylesheet or inline css.
+ * mScripts content is inserted as is in
"<head>" by Skin. This might
+ *
contains
either a link to a stylesheet or inline css.
*/
var $mScripts = '';
*/
var $mScripts = '';
@@
-135,7
+135,7
@@
class OutputPage extends ContextSource {
*/
var $mPageLinkTitle = '';
*/
var $mPageLinkTitle = '';
- /// Array of elements in
<head>
. Parser might add its own headers!
+ /// Array of elements in
"<head>"
. Parser might add its own headers!
var $mHeadItems = array();
// @todo FIXME: Next variables probably comes from the resource loader
var $mHeadItems = array();
// @todo FIXME: Next variables probably comes from the resource loader
@@
-197,7
+197,7
@@
class OutputPage extends ContextSource {
/**
* Comes from the parser. This was probably made to load CSS/JS only
/**
* Comes from the parser. This was probably made to load CSS/JS only
- * if we had
<gallery>
. Used directly in CategoryPage.php
+ * if we had
"<gallery>"
. Used directly in CategoryPage.php
* Looks like resource loader can replace this.
*/
var $mNoGallery = false;
* Looks like resource loader can replace this.
*/
var $mNoGallery = false;
@@
-292,7
+292,7
@@
class OutputPage extends ContextSource {
}
/**
}
/**
- * Add a new
<meta>
tag
+ * Add a new
"<meta>"
tag
* To add an http-equiv meta tag, precede the name with "http:"
*
* @param $name String tag name
* To add an http-equiv meta tag, precede the name with "http:"
*
* @param $name String tag name
@@
-405,7
+405,7
@@
class OutputPage extends ContextSource {
/**
* Add a self-contained script tag with the given contents
*
/**
* Add a self-contained script tag with the given contents
*
- * @param $script String: JavaScript text, no
<script>
tags
+ * @param $script String: JavaScript text, no
"<script>"
tags
*/
public function addInlineScript( $script ) {
$this->mScripts .= Html::inlineScript( "\n$script\n" ) . "\n";
*/
public function addInlineScript( $script ) {
$this->mScripts .= Html::inlineScript( "\n$script\n" ) . "\n";
@@
-779,7
+779,7
@@
class OutputPage extends ContextSource {
}
/**
}
/**
- * "HTML title" means the contents of
<title>
.
+ * "HTML title" means the contents of
"<title>"
.
* It is stored as plain, unescaped text and will be run through htmlspecialchars in the skin file.
*
* @param $name string
* It is stored as plain, unescaped text and will be run through htmlspecialchars in the skin file.
*
* @param $name string
@@
-793,7
+793,7
@@
class OutputPage extends ContextSource {
}
/**
}
/**
- * Return the "HTML title", i.e. the content of the
<title>
tag.
+ * Return the "HTML title", i.e. the content of the
"<title>"
tag.
*
* @return String
*/
*
* @return String
*/
@@
-804,7
+804,7
@@
class OutputPage extends ContextSource {
/**
* Set $mRedirectedFrom, the Title of the page which redirected us to the current page.
*
/**
* Set $mRedirectedFrom, the Title of the page which redirected us to the current page.
*
- *
param @
t Title
+ *
@param $
t Title
*/
public function setRedirectedFrom( $t ) {
$this->mRedirectedFrom = $t;
*/
public function setRedirectedFrom( $t ) {
$this->mRedirectedFrom = $t;
@@
-1362,11
+1362,11
@@
class OutputPage extends ContextSource {
* Set the timestamp of the revision which will be displayed. This is used
* to avoid a extra DB call in Skin::lastModified().
*
* Set the timestamp of the revision which will be displayed. This is used
* to avoid a extra DB call in Skin::lastModified().
*
- * @param $
revid
Mixed: string, or null
+ * @param $
timestamp
Mixed: string, or null
* @return Mixed: previous value
*/
* @return Mixed: previous value
*/
- public function setRevisionTimestamp( $timest
map
) {
- return wfSetVar( $this->mRevisionTimestamp, $timest
ma
p );
+ public function setRevisionTimestamp( $timest
amp
) {
+ return wfSetVar( $this->mRevisionTimestamp, $timest
am
p );
}
/**
}
/**
@@
-2023,11
+2023,11
@@
class OutputPage extends ContextSource {
/**
* Prepare this object to display an error page; disable caching and
* indexing, clear the current text and redirect, set the page's title
/**
* Prepare this object to display an error page; disable caching and
* indexing, clear the current text and redirect, set the page's title
- * and optionally an custom HTML title (content of the
<title>
tag).
+ * and optionally an custom HTML title (content of the
"<title>"
tag).
*
* @param $pageTitle String|Message will be passed directly to setPageTitle()
* @param $htmlTitle String|Message will be passed directly to setHTMLTitle();
*
* @param $pageTitle String|Message will be passed directly to setPageTitle()
* @param $htmlTitle String|Message will be passed directly to setHTMLTitle();
- * optional, if not passed the
<title>
attribute will be
+ * optional, if not passed the
"<title>"
attribute will be
* based on $pageTitle
*/
public function prepareErrorPage( $pageTitle, $htmlTitle = false ) {
* based on $pageTitle
*/
public function prepareErrorPage( $pageTitle, $htmlTitle = false ) {
@@
-2391,7
+2391,7
@@
$templates
/**
* @param $sk Skin The given Skin
* @param $includeStyle Boolean: unused
/**
* @param $sk Skin The given Skin
* @param $includeStyle Boolean: unused
- * @return String: The doctype, opening
<html>
, and head element.
+ * @return String: The doctype, opening
"<html>"
, and head element.
*/
public function headElement( Skin $sk, $includeStyle = true ) {
global $wgContLang;
*/
public function headElement( Skin $sk, $includeStyle = true ) {
global $wgContLang;
@@
-2516,8
+2516,8
@@
$templates
* @param $only String ResourceLoaderModule TYPE_ class constant
* @param $useESI boolean
* @param $extraQuery Array with extra query parameters to add to each request. array( param => value )
* @param $only String ResourceLoaderModule TYPE_ class constant
* @param $useESI boolean
* @param $extraQuery Array with extra query parameters to add to each request. array( param => value )
- * @param $loadCall boolean If true, output an (asynchronous) mw.loader.load() call rather than a
<script src="...">
tag
- * @return string html
<script> and <style>
tags
+ * @param $loadCall boolean If true, output an (asynchronous) mw.loader.load() call rather than a
"<script src='...'>"
tag
+ * @return string html
"<script>" and "<style>"
tags
*/
protected function makeResourceLoaderLink( $modules, $only, $useESI = false, array $extraQuery = array(), $loadCall = false ) {
global $wgResourceLoaderUseESI;
*/
protected function makeResourceLoaderLink( $modules, $only, $useESI = false, array $extraQuery = array(), $loadCall = false ) {
global $wgResourceLoaderUseESI;
@@
-2696,7
+2696,7
@@
$templates
}
/**
}
/**
- * JS stuff to put in the
<head>
. This is the startup module, config
+ * JS stuff to put in the
"<head>"
. This is the startup module, config
* vars and modules marked with position 'top'
*
* @return String: HTML fragment
* vars and modules marked with position 'top'
*
* @return String: HTML fragment
@@
-2744,12
+2744,12
@@
$templates
}
/**
}
/**
- * JS stuff to put at the 'bottom', which can either be the bottom of the
<body>
- * or the bottom of the
<head>
depending on $wgResourceLoaderExperimentalAsyncLoading:
+ * JS stuff to put at the 'bottom', which can either be the bottom of the
"<body>"
+ * or the bottom of the
"<head>"
depending on $wgResourceLoaderExperimentalAsyncLoading:
* modules marked with position 'bottom', legacy scripts ($this->mScripts),
* user preferences, site JS and user JS
*
* modules marked with position 'bottom', legacy scripts ($this->mScripts),
* user preferences, site JS and user JS
*
- * @param $inHead boolean If true, this HTML goes into the
<head>, if false it goes into the <body>
+ * @param $inHead boolean If true, this HTML goes into the
"<head>", if false it goes into the "<body>"
* @return string
*/
function getScriptsForBottomQueue( $inHead ) {
* @return string
*/
function getScriptsForBottomQueue( $inHead ) {
@@
-2865,7
+2865,7
@@
$templates
}
/**
}
/**
- * JS stuff to put at the bottom of the
<body>
+ * JS stuff to put at the bottom of the
"<body>"
* @return string
*/
function getBottomScripts() {
* @return string
*/
function getBottomScripts() {
@@
-2880,7
+2880,7
@@
$templates
/**
* Add one or more variables to be set in mw.config in JavaScript.
*
/**
* Add one or more variables to be set in mw.config in JavaScript.
*
- * @param $key
{String|Array} Key or array of key/value pa
rs.
+ * @param $key
s {String|Array} Key or array of key/value pai
rs.
* @param $value {Mixed} [optional] Value of the configuration variable.
*/
public function addJsConfigVars( $keys, $value = null ) {
* @param $value {Mixed} [optional] Value of the configuration variable.
*/
public function addJsConfigVars( $keys, $value = null ) {
@@
-2963,6
+2963,9
@@
$templates
'wgPageContentLanguage' => $lang->getCode(),
'wgSeparatorTransformTable' => $compactSeparatorTransTable,
'wgDigitTransformTable' => $compactDigitTransTable,
'wgPageContentLanguage' => $lang->getCode(),
'wgSeparatorTransformTable' => $compactSeparatorTransTable,
'wgDigitTransformTable' => $compactDigitTransTable,
+ 'wgDefaultDateFormat' => $lang->getDefaultDateFormat(),
+ 'wgMonthNames' => $lang->getMonthNamesArray(),
+ 'wgMonthNamesShort' => $lang->getMonthAbbreviationsArray(),
'wgRelevantPageName' => $relevantTitle->getPrefixedDBKey(),
);
if ( $wgContLang->hasVariants() ) {
'wgRelevantPageName' => $relevantTitle->getPrefixedDBKey(),
);
if ( $wgContLang->hasVariants() ) {
@@
-3016,7
+3019,7
@@
$templates
}
/**
}
/**
- * @param $addContentType bool: Whether
<meta>
specifying content type should be returned
+ * @param $addContentType bool: Whether
"<meta>"
specifying content type should be returned
*
* @return array in format "link name or number => 'link html'".
*/
*
* @return array in format "link name or number => 'link html'".
*/
@@
-3250,7
+3253,7
@@
$templates
/**
* @param $unused
/**
* @param $unused
- * @param $addContentType bool: Whether
<meta>
specifying content type should be returned
+ * @param $addContentType bool: Whether
"<meta>"
specifying content type should be returned
*
* @return string HTML tag links to be put in the header.
*/
*
* @return string HTML tag links to be put in the header.
*/
@@
-3259,7
+3262,7
@@
$templates
}
/**
}
/**
- * Generate a
<link rel/>
for a feed.
+ * Generate a
"<link rel/>"
for a feed.
*
* @param $type String: feed type
* @param $url String: URL to the feed
*
* @param $type String: feed type
* @param $url String: URL to the feed
@@
-3314,7
+3317,7
@@
$templates
}
/**
}
/**
- * Build a set of
<link>
s for the stylesheets specified in the $this->styles array.
+ * Build a set of
"<link>" element
s for the stylesheets specified in the $this->styles array.
* These will be applied to various media & IE conditionals.
*
* @return string
* These will be applied to various media & IE conditionals.
*
* @return string