Merge "Remove deprecated function mw.util.toggleToc"

diff --combined RELEASE-NOTES-1.24
index 0e7fbe6,88f4974..50d7392
--- 1/RELEASE-NOTES-1.24
--- 2/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@@ -13,11 -13,6 +13,11 @@@ production
  === New features in 1.24 ===
  
  === Bug fixes in 1.24 ===
 +* (bug 62258) A bug was fixed in File::getUnscaledThumb when a height
 +  restriction was present in the parameters.  Images with both the "frame"
 +  option and a size specification set will now always ignore the provided
 +  size and display an unscaled image, as the documentation has always
 +  claimed it would.
  
  === Web API changes in 1.24 ===
  
@@@ -29,6 -24,7 +29,7 @@@ changes to languages because of Bugzill
  
  === Other changes in 1.24 ===
  * The deprecated jquery.delayedBind ResourceLoader module was removed.
+ * The deprecated function mw.util.toggleToc was removed.
  
  == Compatibility ==
  

diff --combined includes/parser/Parser.php
index 1e72cb2,3bf40c6..1a1ef38
--- 1/includes/parser/Parser.php
--- 2/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@@ -710,7 -710,7 +710,7 @@@ class Parser 
         * @param $t Title
         */
        function setTitle( $t ) {
 -              if ( !$t || $t instanceof FakeTitle ) {
 +              if ( !$t ) {
                        $t = Title::newFromText( 'NO TITLE' );
                }
  
@@@ -4524,6 -4524,7 +4524,7 @@@
                        $toc = Linker::tocList( $toc, $this->mOptions->getUserLangObj() );
                        $this->mOutput->setTOCHTML( $toc );
                        $toc = self::TOC_START . $toc . self::TOC_END;
+                       $this->mOutput->addModules( 'mediawiki.toc' );
                }
  
                if ( $isMain ) {
@@@ -5338,7 -5339,6 +5339,7 @@@
                $caption = '';
                $params = array( 'frame' => array(), 'handler' => array(),
                        'horizAlign' => array(), 'vertAlign' => array() );
 +              $seenformat = false;
                foreach ( $parts as $part ) {
                        $part = trim( $part );
                        list( $magicName, $value ) = $mwArray->matchVariableStartToEnd( $part );
@@@ -5406,13 -5406,6 +5407,13 @@@
                                                                }
                                                        }
                                                        break;
 +                                              case 'frameless':
 +                                              case 'framed':
 +                                              case 'thumbnail':
 +                                                      // use first appearing option, discard others.
 +                                                      $validated = ! $seenformat;
 +                                                      $seenformat = true;
 +                                                      break;
                                                default:
                                                        # Most other things appear to be empty or numeric...
                                                        $validated = ( $value === false || is_numeric( trim( $value ) ) );

diff --combined resources/Resources.php
index 6608fcd,3adbe12..8b0d675
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -691,12 -691,11 +691,12 @@@ return array
                        'pt-br' => 'resources/lib/moment/lang/pt-br.js',
                        'pt' => 'resources/lib/moment/lang/pt.js',
                        'ro' => 'resources/lib/moment/lang/ro.js',
 -                      'rs' => 'resources/lib/moment/lang/rs.js',
                        'ru' => 'resources/lib/moment/lang/ru.js',
                        'sk' => 'resources/lib/moment/lang/sk.js',
                        'sl' => 'resources/lib/moment/lang/sl.js',
                        'sq' => 'resources/lib/moment/lang/sq.js',
 +                      'sr-el' => 'resources/lib/moment/lang/sr.js',
 +                      'sr-ec' => 'resources/lib/moment/lang/sr-cyr.js',
                        'sv' => 'resources/lib/moment/lang/sv.js',
                        'ta' => 'resources/lib/moment/lang/ta.js',
                        'th' => 'resources/lib/moment/lang/th.js',
@@@ -706,7 -705,7 +706,7 @@@
                        'tzm' => 'resources/lib/moment/lang/tzm.js',
                        'uk' => 'resources/lib/moment/lang/uk.js',
                        'uz' => 'resources/lib/moment/lang/uz.js',
 -                      'vn' => 'resources/lib/moment/lang/vn.js',
 +                      'vi' => 'resources/lib/moment/lang/vi.js',
                        'zh-cn' => 'resources/lib/moment/lang/zh-cn.js',
                        'zh-tw' => 'resources/lib/moment/lang/zh-tw.js',
                ),
@@@ -899,7 -898,6 +899,6 @@@
                        'jquery.client',
                        'jquery.mwExtension',
                        'mediawiki.notify',
-                       'mediawiki.toc',
                ),
                'position' => 'top', // For $wgPreloadJavaScriptMwUtil
                'targets' => array( 'desktop', 'mobile' ),