Merge "Remove unused parameter"

diff --combined languages/Language.php
index 0efade9,50963b0..d7cd8b5
--- 1/languages/Language.php
--- 2/languages/Language.php
+++ b/languages/Language.php
@@@ -1833,19 -1833,22 +1833,19 @@@ class Language 
                while ( $hebrewMonth <= 12 ) {
                        # Calculate days in this month
                        if ( $isLeap && $hebrewMonth == 6 ) {
 -                              # Adar in a leap year
 -                              if ( $isLeap ) {
 -                                      # Leap year - has Adar I, with 30 days, and Adar II, with 29 days
 -                                      $days = 30;
 +                              # Leap year - has Adar I, with 30 days, and Adar II, with 29 days
 +                              $days = 30;
 +                              if ( $hebrewDay <= $days ) {
 +                                      # Day in Adar I
 +                                      $hebrewMonth = 13;
 +                              } else {
 +                                      # Subtract the days of Adar I
 +                                      $hebrewDay -= $days;
 +                                      # Try Adar II
 +                                      $days = 29;
                                        if ( $hebrewDay <= $days ) {
 -                                              # Day in Adar I
 -                                              $hebrewMonth = 13;
 -                                      } else {
 -                                              # Subtract the days of Adar I
 -                                              $hebrewDay -= $days;
 -                                              # Try Adar II
 -                                              $days = 29;
 -                                              if ( $hebrewDay <= $days ) {
 -                                                      # Day in Adar II
 -                                                      $hebrewMonth = 14;
 -                                              }
 +                                              # Day in Adar II
 +                                              $hebrewMonth = 14;
                                        }
                                }
                        } elseif ( $hebrewMonth == 2 && $yearPattern == 2 ) {
@@@ -4238,12 -4241,11 +4238,11 @@@
        /**
         * Perform output conversion on a string, and encode for safe HTML output.
         * @param string $text Text to be converted
-        * @param bool $isTitle Whether this conversion is for the article title
         * @return string
         * @todo this should get integrated somewhere sane
         */
-       public function convertHtml( $text, $isTitle = false ) {
-               return htmlspecialchars( $this->convert( $text, $isTitle ) );
+       public function convertHtml( $text ) {
+               return htmlspecialchars( $this->convert( $text ) );
        }
  
        /**