Browse Source

Merge pull request #1189 from kapv89/patch-5

Turn profiler off using runtime Config
Dayle Rees 12 years ago
parent
commit
f004ddcea7
1 changed files with 1 additions and 1 deletions
  1. 1 1
      laravel/profiling/profiler.php

+ 1 - 1
laravel/profiling/profiler.php

@@ -27,7 +27,7 @@ class Profiler {
 		// We only want to send the profiler toolbar if the request is not an AJAX
 		// We only want to send the profiler toolbar if the request is not an AJAX
 		// request, as sending it on AJAX requests could mess up JSON driven API
 		// request, as sending it on AJAX requests could mess up JSON driven API
 		// type applications, so we will not send anything in those scenarios.
 		// type applications, so we will not send anything in those scenarios.
-		if ( ! Request::ajax())
+		if ( ! Request::ajax() and Config::get('application.profiler') )
 		{
 		{
 			static::$data['memory'] = get_file_size(memory_get_usage(true));
 			static::$data['memory'] = get_file_size(memory_get_usage(true));
 			static::$data['memory_peak'] = get_file_size(memory_get_peak_usage(true));
 			static::$data['memory_peak'] = get_file_size(memory_get_peak_usage(true));