WordPress.org
Get WordPress

Plugin Directory

Changeset 370950


Ignore:
Timestamp:
04/09/2011 04:36:39 PM (15 years ago)
Author:
beatpanda
Message:

fixing merge conflicts

Location:
wordpress-wiki/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • wordpress-wiki/trunk/controllers/wiki_pages.php

    r370945 r370950  
    7676        $last_h2_pos = explode('</h2>', $content);
    7777        $last_h2_pos = array_pop($last_h2_pos);
    78         $last_h2_pos[1] = $last_h2_pos;
    79         $h3s_contents[1][] = $last_h2_pos;
    80         if (!is_array($h3s_contents[1])) {
     78        if(!empty($last_h2_pos)){
     79            $last_h2_pos[1] = $last_h2_pos;
     80            $h3s_contents[1][] = $last_h2_pos;
     81        }
     82        if (empty($h3s_contents[1])) {
    8183            $h3s_contents[1] = array();
    8284        }
    8385        array_push($h3s_contents[1], $last_h2_pos);
    84 <<<<<<< HEAD
    85         foreach ($h3s_contents[1] as $key => $h3s_content) {
    86             preg_match_all("|<h3>(.*)</h3>|U", $h3s_content, $h3s[$key], PREG_PATTERN_ORDER);
    87         }
    88 =======
    8986            foreach ($h3s_contents[1] as $key => $h3s_content) {
    9087                preg_match_all("|<h3.*>(.*)</h3>|U", $h3s_content, $h3s[$key], PREG_PATTERN_ORDER);
    9188            }
    92 >>>>>>> fixed TOC regex
    9389        $table = "<ol class='content_list'>";
    9490        foreach($h2s as $key => $h2) {

  • wordpress-wiki/trunk/wordpress-wiki.php

    r370949 r370950  
    1717        global $wp_version;
    1818        /**
    19         * Guess the wp-content and plugin urls/paths
     19        * Todo: There is no need to guess the wp-content folder any more...
    2020        */
     21       
    2122        if ( !defined('WP_CONTENT_URL') )
    2223            define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content');
Note: See TracChangeset for help on using the changeset viewer.