Changeset 370924

Timestamp:

04/09/2011 03:57:41 PM (15 years ago)

Author:

beatpanda

Message:

Added patch to fix TOC

Location:

wordpress-wiki/trunk

Files:

• controllers/wiki_pages.php (modified) (1 diff)
• wordpress-wiki.php (modified) (1 diff)

wordpress-wiki/trunk/controllers/wiki_pages.php

@@ -76 +76 @@
         $last_h2_pos = explode('</h2>', $content);
         $last_h2_pos = array_pop($last_h2_pos);
-        $last_h2_pos[1] = $last_h2_pos;
-        $h3s_contents[1][] = $last_h2_pos;
-        if (!is_array($h3s_contents[1])) {
+        if(!empty($last_h2_pos)){
+            $last_h2_pos[1] = $last_h2_pos;
+            $h3s_contents[1][] = $last_h2_pos;
+        }
+        if (empty($h3s_contents[1])) {
             $h3s_contents[1] = array();
         }
         array_push($h3s_contents[1], $last_h2_pos);
-        foreach ($h3s_contents[1] as $key => $h3s_content) {
-            preg_match_all("|<h3>(.*)</h3>|U", $h3s_content, $h3s[$key], PREG_PATTERN_ORDER);
-        }
+            foreach ($h3s_contents[1] as $key => $h3s_content) {
+                preg_match_all("|<h3>(.*)</h3>|U", $h3s_content, $h3s[$key], PREG_PATTERN_ORDER);
+            }
         $table = "<ol class='content_list'>";
         foreach($h2s as $key => $h2) {

wordpress-wiki/trunk/wordpress-wiki.php

@@ -17 +17 @@
         global $wp_version;
         /**
-        * Guess the wp-content and plugin urls/paths
+        * Todo: There is no need to guess the wp-content folder any more...
         */
+        
         if ( !defined('WP_CONTENT_URL') )
             define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content');