Merge "Use canonical class name, remove unused globals."

diff --combined includes/SkinTemplate.php
index eafe233,1b766ab..e3ef6ac
--- 1/includes/SkinTemplate.php
--- 2/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@@ -291,8 -291,8 +291,8 @@@ class SkinTemplate extends Skin 
                if ( $out->isSyndicated() ) {
                        $feeds = array();
                        foreach ( $out->getSyndicationLinks() as $format => $link ) {
 -                              // Give grep a chance to find the usages: feed-atom, feed-rss
                                $feeds[$format] = array(
 +                                      // Messages: feed-atom, feed-rss
                                        'text' => $this->msg( "feed-$format" )->text(),
                                        'href' => $link
                                );
@@@ -589,8 -589,6 +589,6 @@@
         * @return array
         */
        protected function buildPersonalUrls() {
-               global $wgSecureLogin;
- 
                $title = $this->getTitle();
                $request = $this->getRequest();
                $pageurl = $title->getLocalURL();

diff --combined includes/specials/SpecialListfiles.php
index d34c44e,d939bd1..dff1cf7
--- 1/includes/specials/SpecialListfiles.php
--- 2/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@@ -443,7 -443,6 +443,7 @@@ class ImageListPager extends TablePage
                        case 'count':
                                return intval( $value ) + 1;
                        case 'top':
 +                              // Messages: listfiles-latestversion-yes, listfiles-latestversion-no
                                return $this->msg( 'listfiles-latestversion-' . $value );
                }
        }
@@@ -472,7 -471,7 +472,7 @@@
                        'tabindex' => 3,
                ) );
  
-               $inputForm['listfiles-show-all'] = HTML::input( 'ilshowall', 1, 'checkbox', array(
+               $inputForm['listfiles-show-all'] = Html::input( 'ilshowall', 1, 'checkbox', array(
                        'checked' => $this->mShowAll,
                        'tabindex' => 4,
                ) );