| Index: branches/resourceloader/phase3/includes/ResourceLoader.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | * List of core scripts to include if the "core" module is specified - it's like a bucket |
| 29 | 29 | */ |
| 30 | 30 | private static $coreScripts = array( |
| 31 | | - 'jquery' => 'resources/core/jquery-1.4.2.min.js', |
| | 31 | + 'jquery' => 'resources/core/jquery-1.4.2.js', |
| 32 | 32 | 'mw' => 'resources/core/mw.js', |
| 33 | 33 | ); |
| 34 | 34 | /** |
| — | — | @@ -275,7 +275,7 @@ |
| 276 | 276 | $retval = array(); |
| 277 | 277 | $dbr = wfGetDB( DB_SLAVE ); |
| 278 | 278 | $res = $dbr->select( 'msg_resource', array( 'mr_blob', 'mr_resource' ), |
| 279 | | - array( 'mr_resource' => $modules, 'mr_lang' => $this->lang ), |
| | 279 | + array( 'mr_resource' => $modules, 'mr_lang' => $lang ), |
| 280 | 280 | __METHOD__ |
| 281 | 281 | ); |
| 282 | 282 | foreach ( $res as $row ) { |