http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71212

Revision: 71212
Author:   tparscal
Date:     2010-08-17 21:19:44 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
Added handling for debug mode

Modified Paths:
--------------
    branches/resourceloader/phase3/includes/OutputPage.php

Modified: branches/resourceloader/phase3/includes/OutputPage.php
===================================================================
--- branches/resourceloader/phase3/includes/OutputPage.php      2010-08-17 
20:57:08 UTC (rev 71211)
+++ branches/resourceloader/phase3/includes/OutputPage.php      2010-08-17 
21:19:44 UTC (rev 71212)
@@ -2222,7 +2222,7 @@
                global $wgUser, $wgLang, $wgRequest, $wgScriptPath;
                // TODO: Should this be a static function of ResourceLoader 
instead?
                $query = array(
-                       'modules' => implode( '|', array_unique( $modules ) ),
+                       'modules' => implode( '|', array_unique( (array) 
$modules ) ),
                        'user' => $wgUser->isLoggedIn(),
                        'lang' => $wgLang->getCode(),
                        'debug' => (
@@ -2246,8 +2246,15 @@
                global $wgUser, $wgRequest, $wgJsMimeType;
                global $wgStylePath, $wgStyleVersion;
                
+               $scripts = '';
                // Include base modules and wikibits legacy code
-               $scripts = self::makeResourceLoaderLinkedScript( $sk, 
$this->getResources() );
+               if ( $wgRequest->getVal( 'debug' ) === 'true' || 
$wgRequest->getBool( 'debug' ) ) {
+                       foreach ( $this->getResources() as $resource ) {
+                               $scripts .= 
self::makeResourceLoaderLinkedScript( $sk, $resource );
+                       }
+               } else {
+                       $scripts .= self::makeResourceLoaderLinkedScript( $sk, 
$this->getResources() );
+               }
                // Configure page
                $scripts .= Skin::makeGlobalVariablesScript( $sk->getSkinName() 
) . "\n";
                



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to