| Property changes on: branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/includes/resourceloader/ResourceLoader.php:r112052 |
| Index: branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderUserOptionsModule.php |
| — | — | @@ -80,6 +80,13 @@ |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
| | 84 | + * @return bool |
| | 85 | + */ |
| | 86 | + public function supportsURLLoading() { |
| | 87 | + return false; |
| | 88 | + } |
| | 89 | + |
| | 90 | + /** |
| 84 | 91 | * @return string |
| 85 | 92 | */ |
| 86 | 93 | public function getGroup() { |
| Index: branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderUserTokensModule.php |
| — | — | @@ -55,6 +55,13 @@ |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
| | 59 | + * @return bool |
| | 60 | + */ |
| | 61 | + public function supportsURLLoading() { |
| | 62 | + return false; |
| | 63 | + } |
| | 64 | + |
| | 65 | + /** |
| 59 | 66 | * @return string |
| 60 | 67 | */ |
| 61 | 68 | public function getGroup() { |
| Property changes on: branches/wmf/1.19wmf1/includes/resourceloader |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 62 | 69 | Merged /branches/new-installer/phase3/includes/resourceloader:r43664-66004 |
| 63 | 70 | Merged /branches/wmf-deployment/includes/resourceloader:r53381 |
| 64 | 71 | Merged /branches/JSTesting/includes/resourceloader:r100352-107913 |
| 65 | 72 | Merged /branches/REL1_15/phase3/includes/resourceloader:r51646 |
| 66 | 73 | Merged /branches/wmf/1.18wmf1/includes/resourceloader:r97508,111667 |
| 67 | 74 | Merged /branches/sqlite/includes/resourceloader:r58211-58321 |
| 68 | 75 | Merged /trunk/phase3/includes/resourceloader:r111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112052 |