| Index: branches/wmf/1.19wmf1/resources/Resources.php |
| — | — | @@ -537,7 +537,7 @@ |
| 538 | 538 | ), |
| 539 | 539 | 'mediawiki.api.watch' => array( |
| 540 | 540 | 'scripts' => 'resources/mediawiki.api/mediawiki.api.watch.js', |
| 541 | | - 'dependencies' => 'mediawiki.api', |
| | 541 | + 'dependencies' => array('mediawiki.api', 'mediawiki.user'), |
| 542 | 542 | ), |
| 543 | 543 | 'mediawiki.debug' => array( |
| 544 | 544 | 'scripts' => 'resources/mediawiki/mediawiki.debug.js', |
| Property changes on: branches/wmf/1.19wmf1/resources/Resources.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 545 | 545 | Merged /branches/sqlite/resources/Resources.php:r58211-58321 |
| 546 | 546 | Merged /trunk/phase3/resources/Resources.php:r111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750,111809 |
| 547 | 547 | Merged /branches/new-installer/phase3/resources/Resources.php:r43664-66004 |
| 548 | 548 | Merged /branches/JSTesting/resources/Resources.php:r100352-107913 |
| 549 | 549 | Merged /branches/REL1_15/phase3/resources/Resources.php:r51646 |
| 550 | 550 | Merged /branches/wmf/1.18wmf1/resources/Resources.php:r97508,111667 |
| 551 | 551 | Merged /branches/REL1_17/phase3/resources/Resources.php:r81445,81448 |