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 "Use @lang tags for Lua scripts"
[lhc/web/wiklou.git]
/
includes
/
OutputPage.php
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
4c4fb1c
..
f5405d7
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-67,13
+67,6
@@
class OutputPage extends ContextSource {
*/
public $mBodytext = '';
*/
public $mBodytext = '';
- /**
- * Holds the debug lines that will be output as comments in page source if
- * $wgDebugComments is enabled. See also $wgShowDebug.
- * @deprecated since 1.20; use MWDebug class instead.
- */
- public $mDebugtext = '';
-
/** @var string Stores contents of "<title>" tag */
private $mHTMLtitle = '';
/** @var string Stores contents of "<title>" tag */
private $mHTMLtitle = '';
@@
-2268,7
+2261,7
@@
class OutputPage extends ContextSource {
ob_start();
$response->header( 'Content-type: ' . $config->get( 'MimeType' ) . '; charset=UTF-8' );
ob_start();
$response->header( 'Content-type: ' . $config->get( 'MimeType' ) . '; charset=UTF-8' );
- $response->header( 'Content-language: ' . $config->get( '
LanguageCode'
) );
+ $response->header( 'Content-language: ' . $config->get( '
ContLang' )->getHtmlCode(
) );
// Avoid Internet Explorer "compatibility view" in IE 8-10, so that
// jQuery etc. can work correctly.
// Avoid Internet Explorer "compatibility view" in IE 8-10, so that
// jQuery etc. can work correctly.
@@
-3057,8
+3050,8
@@
class OutputPage extends ContextSource {
if ( $user->isLoggedIn() ) {
$vars['wgUserId'] = $user->getId();
$vars['wgUserEditCount'] = $user->getEditCount();
if ( $user->isLoggedIn() ) {
$vars['wgUserId'] = $user->getId();
$vars['wgUserEditCount'] = $user->getEditCount();
- $userReg =
wfTimestampOrNull( TS_UNIX, $user->getRegistration()
);
- $vars['wgUserRegistration'] = $userReg
!== null ? ( $userReg * 1000 )
: null;
+ $userReg =
$user->getRegistration(
);
+ $vars['wgUserRegistration'] = $userReg
? wfTimestamp( TS_UNIX, $userReg ) * 1000
: null;
// Get the revision ID of the oldest new message on the user's talk
// page. This can be used for constructing new message alerts on
// the client side.
// Get the revision ID of the oldest new message on the user's talk
// page. This can be used for constructing new message alerts on
// the client side.