New global config setting $wgMaxTocLevel: Maximum indent level of toc.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index eb9c1d1..905518e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -442,4 +442,7 @@ $wgExtraRandompageSQL = false;
 
 # Allow the "info" action, very inefficient at the moment
 $wgAllowPageInfo = false;
+
+# Maximum indent level of toc.
+$wgMaxTocLevel = 999;
 ?>

diff --git a/includes/Parser.php b/includes/Parser.php
index 1d36b39..5ee3778 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1848,7 +1848,7 @@ class Parser
  */
 
        /* private */ function formatHeadings( $text, $isMain=true ) {
-               global $wgInputEncoding;
+               global $wgInputEncoding, $wgMaxTocLevel;
 
                $doNumberHeadings = $this->mOptions->getNumberHeadings();
                $doShowToc = $this->mOptions->getShowToc();
@@ -1990,7 +1990,7 @@ class Parser
                        if($refcount[$headlineCount] > 1 ) {
                                $anchor .= '_' . $refcount[$headlineCount];
                        }
-                       if( $doShowToc ) {
+                       if( $doShowToc && ( !isset($wgMaxTocLevel) || $toclevel<$wgMaxTocLevel ) ) {
                                $toc .= $sk->tocLine($anchor,$tocline,$toclevel);
                        }
                        if( $showEditLink ) {