Merge "Set modes back to 0644 to ImagePage.php and Resources.php"

diff --combined includes/ImagePage.php
index 5fa44d5,9308195..5fa44d5
mode 100755,100644..100644
--- 1/includes/ImagePage.php
--- 2/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@@ -250,7 -250,7 +250,7 @@@ class ImagePage extends Article 
         *
         * @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata().
         *
 -       * @param array $metadata the array containing the EXIF data
 +       * @param array $metadata the array containing the Exif data
         * @return String The metadata table. This is treated as Wikitext (!)
         */
        protected function makeMetadataTable( $metadata ) {
@@@ -311,12 -311,6 +311,12 @@@
                        } else {
                                $params = array( 'page' => $page );
                        }
 +
 +                      $renderLang = $request->getVal( 'lang' );
 +                      if ( !is_null( $renderLang ) ) {
 +                              $params['lang'] = $renderLang;
 +                      }
 +
                        $width_orig = $this->displayImg->getWidth( $page );
                        $width = $width_orig;
                        $height_orig = $this->displayImg->getHeight( $page );

diff --combined resources/Resources.php
index f13f414,df706eb..f13f414
mode 100755,100644..100644
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -61,10 -61,7 +61,10 @@@ return array
         * See Vector for an example.
         */
        'skins.cologneblue' => array(
 -              'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ),
 +              'styles' => array(
 +                      'cologneblue/screen.css' => array( 'media' => 'screen' ),
 +                      'cologneblue/print.css' => array( 'media' => 'print' ),
 +              ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
@@@ -99,12 -96,7 +99,12 @@@
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
        'skins.vector.js' => array(
 -              'scripts' => 'vector/vector.js',
 +              'scripts' => array(
 +                      'vector/collapsibleTabs.js',
 +                      'vector/vector.js',
 +              ),
 +              'position' => 'top',
 +              'dependencies' => 'jquery.delayedBind',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
@@@ -590,12 -582,6 +590,12 @@@
                        'mediawiki.Title',
                ),
        ),
 +      'mediawiki.api.login' => array(
 +              'scripts' => 'resources/mediawiki.api/mediawiki.api.login.js',
 +              'dependencies' => array(
 +                      'mediawiki.api',
 +              ),
 +      ),
        'mediawiki.api.parse' => array(
                'scripts' => 'resources/mediawiki.api/mediawiki.api.parse.js',
                'dependencies' => 'mediawiki.api',
@@@ -607,9 -593,6 +607,9 @@@
                        'user.tokens',
                ),
        ),
 +      'mediawiki.icon' => array(
 +              'styles' => 'resources/mediawiki/mediawiki.icon.css',
 +      ),
        'mediawiki.debug' => array(
                'scripts' => 'resources/mediawiki/mediawiki.debug.js',
                'styles' => 'resources/mediawiki/mediawiki.debug.css',
@@@ -682,7 -665,6 +682,7 @@@
                        'jquery.client',
                        'jquery.placeholder',
                        'jquery.suggestions',
 +                      'mediawiki.api',
                ),
        ),
        'mediawiki.Title' => array(
@@@ -719,25 -701,11 +719,25 @@@
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
 +                      'mediawiki.action.edit.styles',
 +                      'mediawiki.legacy.wikibits',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
                'position' => 'top',
        ),
 +      'mediawiki.action.edit.styles' => array(
 +              'styles' => 'resources/mediawiki.action/mediawiki.action.edit.styles.css',
 +              'position' => 'top',
 +      ),
 +      'mediawiki.action.edit.collapsibleFooter' => array(
 +              'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
 +              'styles' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
 +              'dependencies' => array(
 +                      'jquery.makeCollapsible',
 +                      'mediawiki.icon',
 +              ),
 +      ),
        'mediawiki.action.edit.preview' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.preview.js',
                'dependencies' => array(
@@@ -769,14 -737,7 +769,14 @@@
        ),
        'mediawiki.action.view.postEdit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.view.postEdit.js',
 -              'dependencies' => 'jquery.cookie'
 +              'styles' => 'resources/mediawiki.action/mediawiki.action.view.postEdit.css',
 +              'dependencies' => array(
 +                      'jquery.cookie',
 +                      'mediawiki.jqueryMsg'
 +              ),
 +              'messages' => array(
 +                      'postedit-confirmation',
 +              ),
        ),
        'mediawiki.action.view.rightClickEdit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
@@@ -856,9 -817,6 +856,9 @@@
  
        /* MediaWiki Page */
  
 +      'mediawiki.page.gallery' => array(
 +              'scripts' => 'resources/mediawiki.page/mediawiki.page.gallery.js',
 +      ),
        'mediawiki.page.ready' => array(
                'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
@@@ -945,9 -903,7 +945,9 @@@
        ),
        'mediawiki.special.changeslist' => array(
                'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
 -              'dependencies' => array( 'jquery.makeCollapsible' ),
 +      ),
 +      'mediawiki.special.changeslist.enhanced' => array(
 +              'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
        ),
        'mediawiki.special.movePage' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js',
@@@ -956,7 -912,6 +956,7 @@@
        'mediawiki.special.preferences' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
                'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
 +              'position' => 'top',
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js',
@@@ -976,7 -931,7 +976,7 @@@
                'scripts' => 'resources/mediawiki.special/mediawiki.special.undelete.js',
        ),
        'mediawiki.special.upload' => array(
 -              // @TODO: merge in remainder of mediawiki.legacy.upload
 +              // @todo merge in remainder of mediawiki.legacy.upload
                'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js',
                'messages' => array(
                        'widthheight',
@@@ -988,24 -943,27 +988,24 @@@
                ),
                'dependencies' => array( 'mediawiki.libs.jpegmeta', 'mediawiki.util' ),
        ),
 -      'mediawiki.special.userlogin.signup' => array(
 -              'scripts' => 'resources/mediawiki.special/mediawiki.special.userLogin.signup.js',
 -      ),
 -      'mediawiki.special.userlogin.vform' => array(
 +      'mediawiki.special.userlogin' => array(
                'styles' => array(
                        'resources/mediawiki.special/mediawiki.special.vforms.css',
 -                      'resources/mediawiki.special/mediawiki.special.userLogin.vform.css',
 +                      'resources/mediawiki.special/mediawiki.special.userLogin.css',
                ),
                'position' => 'top',
        ),
 -      'mediawiki.special.createaccount.vform' => array(
 +      'mediawiki.special.createaccount' => array(
                'styles' => array(
                        'resources/mediawiki.special/mediawiki.special.vforms.css',
 -                      'resources/mediawiki.special/mediawiki.special.createAccount.vform.css',
 +                      'resources/mediawiki.special/mediawiki.special.createAccount.css',
                ),
 -              'position' => 'top',
        ),
 -      'mediawiki.special.createaccount.vform.js' => array(
 -              'scripts' => 'resources/mediawiki.special/mediawiki.special.createAccount.vform.js',
 +      'mediawiki.special.createaccount.js' => array(
 +              'scripts' => 'resources/mediawiki.special/mediawiki.special.createAccount.js',
                'messages' => array(
                        'createacct-captcha',
 +                      'createacct-emailrequired',
                        'createacct-imgcaptcha-ph'
                ),
                'dependencies' => 'mediawiki.jqueryMsg',
@@@ -1092,8 -1050,6 +1092,8 @@@
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => array(
 +                      'mediawiki.api',
 +                      'mediawiki.Title',
                        'mediawiki.legacy.wikibits',
                        'mediawiki.util',
                ),