Merge "Use file width/height instead of metadata for getContentHeaders" into wmf...

diff --git a/extensions/PdfHandler b/extensions/PdfHandler
index 60f3c12..34cd061 160000 (submodule)
--- a/extensions/PdfHandler
+++ b/extensions/PdfHandler
@@ -1 +1 @@
-Subproject commit 60f3c1213455b0d19adb7d9c0532f4bd439a5845
+Subproject commit 34cd061ec99fdb38629aadb6b4cf957872dd0ced

diff --git a/resources/Resources.php b/resources/Resources.php
index 4237639..5a75e5a 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1685,6 +1685,7 @@ return [
        'mediawiki.page.watch.ajax' => [
                'scripts' => 'resources/src/mediawiki/page/watch.js',
                'dependencies' => [
+                       'mediawiki.page.startup',
                        'mediawiki.api.watch',
                        'mediawiki.notify',
                        'mediawiki.util',