Browse Source

Merge pull request #681 from bencorlett/develop

Added Output Buffering
Taylor Otwell 12 years ago
parent
commit
8dbe2d1a9a
2 changed files with 33 additions and 0 deletions
  1. 14 0
      laravel/core.php
  2. 19 0
      laravel/redirect.php

+ 14 - 0
laravel/core.php

@@ -17,6 +17,20 @@ define('BLADE_EXT', '.blade.php');
 define('DEFAULT_BUNDLE', 'application');
 define('DEFAULT_BUNDLE', 'application');
 define('MB_STRING', (int) function_exists('mb_get_info'));
 define('MB_STRING', (int) function_exists('mb_get_info'));
 
 
+/*
+|--------------------------------------------------------------------------
+| Start Output Buffering
+|--------------------------------------------------------------------------
+|
+| Output buffering allows us to capture all output at any time, so that we
+| can discard it or treat it accordingly. An example of this is if you have
+| echoed a string, but want to return a Redirect object. Because Symfony
+| only checks if headers have been sent, your redirect just silently fails.
+|
+*/
+
+ob_start('mb_output_handler');
+
 /*
 /*
 |--------------------------------------------------------------------------
 |--------------------------------------------------------------------------
 | Require Core Classes
 | Require Core Classes

+ 19 - 0
laravel/redirect.php

@@ -165,4 +165,23 @@ class Redirect extends Response {
 		return $this->with('errors', $errors);
 		return $this->with('errors', $errors);
 	}
 	}
 
 
+	/**
+	 * Send the headers and content of the response to the browser.
+	 *
+	 * @return void
+	 */
+	public function send()
+	{
+		// Dump all output buffering, this ensures
+		// that symphony will send our redirect headers
+		// properly if we've outputted any content from
+		// within Laravel.
+		while (ob_get_level() > 0)
+		{
+			ob_end_clean();
+		}
+
+		return parent::send();
+	}
+
 }
 }