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
SECURITY: Disallow loading JS/CSS/Json subpages from unregistered users and log
[lhc/web/wiklou.git]
/
includes
/
MediaWiki.php
diff --git
a/includes/MediaWiki.php
b/includes/MediaWiki.php
index
150c72f
..
b3abe7c
100644
(file)
--- a/
includes/MediaWiki.php
+++ b/
includes/MediaWiki.php
@@
-548,6
+548,9
@@
class MediaWiki {
}
}
}
}
+ MWExceptionHandler::handleException( $e );
+ } catch ( Error $e ) {
+ // Type errors and such: at least handle it now and clean up the LBFactory state
MWExceptionHandler::handleException( $e );
}
MWExceptionHandler::handleException( $e );
}
@@
-858,7
+861,7
@@
class MediaWiki {
$this->performRequest();
// GUI-ify and stash the page output in MediaWiki::doPreOutputCommit() while
$this->performRequest();
// GUI-ify and stash the page output in MediaWiki::doPreOutputCommit() while
- // ChronologyProtector synchronizes DB positions or
slave
s accross all datacenters.
+ // ChronologyProtector synchronizes DB positions or
replica
s accross all datacenters.
$buffer = null;
$outputWork = function () use ( $output, &$buffer ) {
if ( $buffer === null ) {
$buffer = null;
$outputWork = function () use ( $output, &$buffer ) {
if ( $buffer === null ) {
@@
-1028,7
+1031,7
@@
class MediaWiki {
$port = $info['port'];
}
$port = $info['port'];
}
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$sock = $host ? fsockopen(
$host,
$port,
$sock = $host ? fsockopen(
$host,
$port,
@@
-1037,7
+1040,7
@@
class MediaWiki {
// If it takes more than 100ms to connect to ourselves there is a problem...
0.100
) : false;
// If it takes more than 100ms to connect to ourselves there is a problem...
0.100
) : false;
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
$invokedWithSuccess = true;
if ( $sock ) {
$invokedWithSuccess = true;
if ( $sock ) {