| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -3685,8 +3685,6 @@ |
| 3686 | 3686 | function formatHeadings( $text, $origText, $isMain=true ) { |
| 3687 | 3687 | global $wgMaxTocLevel, $wgContLang, $wgHtml5, $wgExperimentalHtmlIds; |
| 3688 | 3688 | |
| 3689 | | - $doNumberHeadings = $this->mOptions->getNumberHeadings(); |
| 3690 | | - |
| 3691 | 3689 | # Inhibit editsection links if requested in the page |
| 3692 | 3690 | if ( isset( $this->mDoubleUnderscores['noeditsection'] ) ) { |
| 3693 | 3691 | $showEditLink = 0; |
| — | — | @@ -3904,7 +3902,7 @@ |
| 3905 | 3903 | } |
| 3906 | 3904 | |
| 3907 | 3905 | # Don't number the heading if it is the only one (looks silly) |
| 3908 | | - if ( $doNumberHeadings && count( $matches[3] ) > 1) { |
| | 3906 | + if ( count( $matches[3] ) > 1 && $this->mOptions->getNumberHeadings() ) { |
| 3909 | 3907 | # the two are different if the line contains a link |
| 3910 | 3908 | $headline = $numbering . ' ' . $headline; |
| 3911 | 3909 | } |
| Index: trunk/phase3/includes/parser/ParserOutput.php |
| — | — | @@ -123,7 +123,7 @@ |
| 124 | 124 | $mProperties = array(), # Name/value pairs to be cached in the DB |
| 125 | 125 | $mTOCHTML = ''; # HTML of the TOC |
| 126 | 126 | private $mIndexPolicy = ''; # 'index' or 'noindex'? Any other value will result in no change. |
| 127 | | - private $mAccessedOptions = null; # List of ParserOptions (stored in the keys) |
| | 127 | + private $mAccessedOptions = array(); # List of ParserOptions (stored in the keys) |
| 128 | 128 | |
| 129 | 129 | const EDITSECTION_REGEX = '#<(?:mw:)?editsection page="(.*?)" section="(.*?)"(?:/>|>(.*?)(</(?:mw:)?editsection>))#'; |
| 130 | 130 | |