X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoader.php;h=15bb13f4cb9dbfcbfa812fd941496723aafae41b;hb=ff05579d1c7fcf9d449bdd474b48338dd58b1c5d;hp=5ee9fdba0665fe52a8bb14372e1a2bf4141f8437;hpb=b126e82f168f8bc1ad56c16b0bd3b69e309003c0;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index 5ee9fdba06..15bb13f4cb 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -212,7 +212,6 @@ class ResourceLoader { $this->errors[] = self::formatExceptionNoComment( $e ); } - return $result; } @@ -225,7 +224,6 @@ class ResourceLoader { public function __construct( Config $config = null ) { global $IP; - if ( $config === null ) { wfDebug( __METHOD__ . ' was called without providing a Config instance' ); $config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' ); @@ -360,7 +358,6 @@ class ResourceLoader { . 'Edit your LocalSettings.php to enable it.' ); } - // Get core test suites $testModules = array(); $testModules['qunit'] = array(); @@ -566,7 +563,6 @@ class ResourceLoader { // See http://bugs.php.net/bug.php?id=36514 ob_start(); - // Find out which modules are missing and instantiate the others $modules = array(); $missing = array(); @@ -595,8 +591,6 @@ class ResourceLoader { $this->errors[] = self::formatExceptionNoComment( $e ); } - wfProfileIn( __METHOD__ . '-getModifiedTime' ); - // To send Last-Modified and support If-Modified-Since, we need to detect // the last modified time $mtime = wfTimestamp( TS_UNIX, $this->config->get( 'CacheEpoch' ) ); @@ -614,8 +608,6 @@ class ResourceLoader { } } - wfProfileOut( __METHOD__ . '-getModifiedTime' ); - // If there's an If-Modified-Since header, respond with a 304 appropriately if ( $this->tryRespondLastModified( $context, $mtime ) ) { return; // output handled (buffers cleared) @@ -864,7 +856,6 @@ class ResourceLoader { no modules were requested. Max made me put this here. */"; } - $image = $context->getImageObj(); if ( $image ) { $data = $image->getImageData( $context ); @@ -902,7 +893,6 @@ class ResourceLoader { * @var $module ResourceLoaderModule */ - wfProfileIn( __METHOD__ . '-' . $name ); try { $scripts = ''; if ( $context->shouldIncludeScripts() ) { @@ -1016,7 +1006,6 @@ class ResourceLoader { unset( $modules[$name] ); } $isRaw |= $module->isRaw(); - wfProfileOut( __METHOD__ . '-' . $name ); } // Update module states