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 "Remove pointless override of doStashFile in UploadFromStash"
[lhc/web/wiklou.git]
/
load.php
diff --git
a/load.php
b/load.php
index
43c2faf
..
c832237
100644
(file)
--- a/
load.php
+++ b/
load.php
@@
-24,22
+24,26
@@
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\Logger\LoggerFactory;
-require __DIR__ . '/includes/WebStart.php';
+// This endpoint is supposed to be independent of request cookies and other
+// details of the session. Enforce this constraint with respect to session use.
+define( 'MW_NO_SESSION', 1 );
+require __DIR__ . '/includes/WebStart.php';
// URL safety checks
if ( !$wgRequest->checkUrlExtension() ) {
return;
}
// URL safety checks
if ( !$wgRequest->checkUrlExtension() ) {
return;
}
-// Respond to resource loading request.
-// foo()->bar() syntax is not supported in PHP4, and this file needs to *parse* in PHP4.
-$configFactory = ConfigFactory::getDefaultInstance();
+// Set up ResourceLoader
$resourceLoader = new ResourceLoader(
$resourceLoader = new ResourceLoader(
-
$configFactory
->makeConfig( 'main' ),
+
ConfigFactory::getDefaultInstance()
->makeConfig( 'main' ),
LoggerFactory::getInstance( 'resourceloader' )
);
LoggerFactory::getInstance( 'resourceloader' )
);
-$resourceLoader->respond( new ResourceLoaderContext( $resourceLoader, $wgRequest ) );
+$context = new ResourceLoaderContext( $resourceLoader, $wgRequest );
+
+// Respond to ResourceLoader request
+$resourceLoader->respond( $context );
Profiler::instance()->setTemplated( true );
Profiler::instance()->setTemplated( true );