| Index: branches/wmf/1.18wmf1/tests/qunit/index.html |
| — | — | @@ -2,7 +2,7 @@ |
| 3 | 3 | <html> |
| 4 | 4 | <head> |
| 5 | 5 | <title>MediaWiki JavaScript Test Suite</title> |
| 6 | | - |
| | 6 | + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> |
| 7 | 7 | <!-- MediaWiki Modules --> |
| 8 | 8 | |
| 9 | 9 | <!-- MW: startup --> |
| Property changes on: branches/wmf/1.18wmf1/tests/qunit/index.html |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 10 | 10 | Merged /branches/sqlite/tests/qunit/index.html:r58211-58321 |
| 11 | 11 | Merged /trunk/phase3/tests/qunit/index.html:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94614,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812 |
| 12 | 12 | Merged /branches/new-installer/phase3/tests/qunit/index.html:r43664-66004 |
| 13 | 13 | Merged /branches/REL1_15/phase3/tests/qunit/index.html:r51646 |
| 14 | 14 | Merged /branches/REL1_17/phase3/tests/qunit/index.html:r81445,81448 |
| Index: branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderFileModule.php |
| — | — | @@ -262,7 +262,7 @@ |
| 263 | 263 | // Collect referenced files |
| 264 | 264 | $this->localFileRefs = array_unique( $this->localFileRefs ); |
| 265 | 265 | // If the list has been modified since last time we cached it, update the cache |
| 266 | | - if ( $this->localFileRefs !== $this->getFileDependencies( $context->getSkin() ) ) { |
| | 266 | + if ( $this->localFileRefs !== $this->getFileDependencies( $context->getSkin() ) && !wfReadOnly() ) { |
| 267 | 267 | $dbw = wfGetDB( DB_MASTER ); |
| 268 | 268 | $dbw->replace( 'module_deps', |
| 269 | 269 | array( array( 'md_module', 'md_skin' ) ), array( |
| Property changes on: branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderFileModule.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 270 | 270 | Merged /branches/sqlite/includes/resourceloader/ResourceLoaderFileModule.php:r58211-58321 |
| 271 | 271 | Merged /trunk/phase3/includes/resourceloader/ResourceLoaderFileModule.php:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812 |
| 272 | 272 | Merged /branches/new-installer/phase3/includes/resourceloader/ResourceLoaderFileModule.php:r43664-66004 |
| 273 | 273 | Merged /branches/wmf-deployment/includes/resourceloader/ResourceLoaderFileModule.php:r53381 |
| 274 | 274 | Merged /branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFileModule.php:r97670 |
| 275 | 275 | Merged /branches/REL1_15/phase3/includes/resourceloader/ResourceLoaderFileModule.php:r51646 |