diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2008-01-18 23:36:14 +0100 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2008-01-18 23:36:14 +0100 |
| commit | 66f0724c3cdd2ea1de313bf407d40c38faf95b1d (patch) | |
| tree | b55ef786f3726f361abf291f967f5d8bf4822cdc /system/libraries | |
| parent | d087ef8d248878c64162f6556f6bef320c92c73c (diff) | |
multiple view concatenation support
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Loader.php | 2 | ||||
| -rw-r--r-- | system/libraries/Output.php | 25 |
2 files changed, 25 insertions, 2 deletions
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index a61b96322..d2f57027a 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -719,7 +719,7 @@ class CI_Loader { {
// PHP 4 requires that we use a global
global $OUT;
- $OUT->set_output(ob_get_contents());
+ $OUT->append_output(ob_get_contents());
@ob_end_clean();
}
}
diff --git a/system/libraries/Output.php b/system/libraries/Output.php index bafc9a18e..14640d85a 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -71,7 +71,30 @@ class CI_Output { }
// --------------------------------------------------------------------
-
+
+ /**
+ * Append Output
+ *
+ * Appends data onto the output string
+ *
+ * @access public
+ * @param string
+ * @return void
+ */
+ function append_output($output)
+ {
+ if ($this->final_output == '')
+ {
+ $this->final_output = $output;
+ }
+ else
+ {
+ $this->final_output .= $output;
+ }
+ }
+
+ // --------------------------------------------------------------------
+
/**
* Set Header
*
|