Committed fix to issue #3450 (http://compo.sr/tracker/view.php?id=3450). [Comcode page titles may leak into other Comcode pages when main_comcode_page_children used]

Author: World Wide Web Server

sources/blocks/main_comcode_page_children.php

@@ -101,7 +101,9 @@ public function run($map)
                     );
 
                     // Execute child page and get its title
+                    push_output_state();
                     request_page($child['the_page'], false, $child['the_zone'], null, true);
+                    restore_output_state();
                     $_title = $GLOBALS['SITE_DB']->query_select_value_if_there('cached_comcode_pages', 'cc_page_title', array('the_page' => $child['the_page'], 'the_zone' => $child['the_zone']));
                     if (!is_null($_title)) {
                         $title = get_translated_text($_title);

sources/comcode_renderer.php

@@ -1084,9 +1084,9 @@ function _do_tags_comcode($tag, $attributes, $embed, $comcode_dangerous, $pass_i
                 break;
             }
 
-            $temp_comcode_parse_title = $COMCODE_PARSE_TITLE;
+            push_output_state();
             $temp = request_page($codename, false, $zone, null, true);
-            $COMCODE_PARSE_TITLE = $temp_comcode_parse_title;
+            restore_output_state();
             if ($temp->is_empty()) {
                 $temp_tpl = do_template('WARNING_BOX', array(
                     '_GUID' => '1d617fd24b632640dddeeadd8432d7a9',

sources/global3.php

@@ -117,6 +117,7 @@ function init__global3()
         'CSS_OUTPUT_STARTED',
         'CYCLES',
         'TEMPCODE_SETGET',
+        'COMCODE_PARSE_TITLE',
     );
     _load_blank_output_state();
 
@@ -418,7 +419,7 @@ function push_output_state($just_tempcode = false, $true_blank = false)
     global $OUTPUT_STATE_STACK, $OUTPUT_STATE_VARS;
     $current_state = array();
     foreach ($OUTPUT_STATE_VARS as $var) {
-        $current_state[$var] = $GLOBALS[$var];
+        $current_state[$var] = isset($GLOBALS[$var]) ? $GLOBALS[$var] : null;
     }
     array_push($OUTPUT_STATE_STACK, $current_state);
     _load_blank_output_state($just_tempcode, $true_blank);

sources/zones2.php

@@ -138,7 +138,9 @@ function render_comcode_page_box($row, $give_context = true, $include_breadcrumb
     $summary = $_summary[1];
 
     if (get_option('is_on_comcode_page_cache') == '1') { // Try and force a parse of the page
+        push_output_state();
         request_page($row['the_page'], false, $row['the_zone'], null, true);
+        restore_output_state();
     }
 
     $row2 = $GLOBALS['SITE_DB']->query_select('cached_comcode_pages', array('*'), array('the_zone' => $row['the_zone'], 'the_page' => $row['the_page']), '', 1);