Merge "Revert "Do not double load gallery styles now cache has expired""

diff --combined resources/Resources.php
index 54d14a9,07142a5..fc0bed1
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1151,31 -1151,19 +1151,31 @@@ return array
                ),
        ),
        'mediawiki.Upload.Dialog' => array(
 -              'scripts' => 'resources/src/mediawiki/mediawiki.Upload.Dialog.js',
 +              'scripts' => array(
 +                      'resources/src/mediawiki/mediawiki.Upload.Dialog.js',
 +              ),
                'dependencies' => array(
 -                      'oojs-ui',
 -                      'mediawiki.Upload',
 +                      'mediawiki.Upload.BookletLayout',
                ),
                'messages' => array(
                        'upload-dialog-title',
 -                      'upload-dialog-error',
 -                      'upload-dialog-warning',
                        'upload-dialog-button-cancel',
                        'upload-dialog-button-done',
                        'upload-dialog-button-save',
                        'upload-dialog-button-upload',
 +              ),
 +      ),
 +      'mediawiki.Upload.BookletLayout' => array(
 +              'scripts' => array(
 +                      'resources/src/mediawiki/mediawiki.Upload.BookletLayout.js',
 +              ),
 +              'dependencies' => array(
 +                      'oojs-ui',
 +                      'mediawiki.Upload',
 +              ),
 +              'messages' => array(
 +                      'upload-dialog-error',
 +                      'upload-dialog-warning',
                        'upload-dialog-label-select-file',
                        'upload-dialog-label-infoform-title',
                        'upload-dialog-label-infoform-name',
@@@ -1771,6 -1759,8 +1771,8 @@@
        'mediawiki.legacy.commonPrint' => array(
                'position' => 'top',
                'styles' => array(
+                       // @todo: Remove mediawiki.page.gallery when cache has cleared
+                       'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
                        // @todo: Remove mediawiki.action.view.filepage.print.css when cache has cleared
                        'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
                        'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
@@@ -1785,6 -1775,8 +1787,8 @@@
        'mediawiki.legacy.shared' => array(
                'position' => 'top',
                'styles' => array(
+                       // @todo: Remove when mediawiki.page.gallery in cached html.
+                       'resources/src/mediawiki.page/mediawiki.page.gallery.css',
                        // @todo: Remove mediawiki.action.view.filepage.css
                        // and mediawiki.legacy/images/checker.png when cache has cleared
                        'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',