Merge branch 'master' into develop

taylorotwell · taylorotwell · commit abff7d8e7d6c · 2013-01-06T14:01:18.000-06:00
diff --git a/laravel/core.php b/laravel/core.php
@@ -171,9 +171,9 @@
 
 if (Request::cli())
 {
-	$environment = get_cli_option('env');
+	$environment = get_cli_option('env', getenv('LARAVEL_ENV'));
 
-	if ( ! isset($environment))
+	if (empty($environment))
 	{
 		$environment = Request::detect_env($environments, gethostname());
 	}
@@ -240,4 +240,4 @@
 foreach ($bundles as $bundle => $config)
 {
 	Bundle::register($bundle, $config);
-}
+}
diff --git a/laravel/log.php b/laravel/log.php
@@ -33,14 +33,21 @@ protected static function exception_line($e)
 	 *
 	 *		// Write an "error" message using the class' magic method
 	 *		Log::error('Something went horribly wrong!');
+	 *
+	 *		// Log an arrays data
+	 *		Log::write('info', array('name' => 'Sawny', 'passwd' => '1234', array(1337, 21, 0)), true);
+	 *      //Result: Array ( [name] => Sawny [passwd] => 1234 [0] => Array ( [0] => 1337 [1] => 21 [2] => 0 ) )
+	 *      //If we had omit the third parameter the result had been: Array
 	 * </code>
 	 *
 	 * @param  string  $type
 	 * @param  string  $message
 	 * @return void
 	 */
-	public static function write($type, $message)
+	public static function write($type, $message, $pretty_print = false)
 	{
+		$message = ($pretty_print) ? print_r($message, true) : $message;
+
 		// If there is a listener for the log event, we'll delegate the logging
 		// to the event and not write to the log files. This allows for quick
 		// swapping of log implementations for debugging.
@@ -75,11 +82,18 @@ protected static function format($type, $message)
 	 *
 	 *		// Write a "warning" message to the log file
 	 *		Log::warning('This is a warning!');
+	 *
+	 *		// Log an arrays data
+	 *		Log::info(array('name' => 'Sawny', 'passwd' => '1234', array(1337, 21, 0)), true);
+	 *      //Result: Array ( [name] => Sawny [passwd] => 1234 [0] => Array ( [0] => 1337 [1] => 21 [2] => 0 ) )
+	 *      //If we had omit the second parameter the result had been: Array
 	 * </code>
 	 */
 	public static function __callStatic($method, $parameters)
 	{
-		static::write($method, $parameters[0]);
+		$parameters[1] = (empty($parameters[1])) ? false : $parameters[1];
+
+		static::write($method, $parameters[0], $parameters[1]);
 	}
 
 }
diff --git a/laravel/profiling/profiler.css b/laravel/profiling/profiler.css
@@ -13,6 +13,7 @@
 	right:0 !important;
 	width:100%;
 	z-index: 9999 !important;
+	color: #000;
 }
 
 .anbu-tabs

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,9 @@`
`171`	`171`
`172`	`172`	`if (Request::cli())`
`173`	`173`	`{`
`174`		`- $environment = get_cli_option('env');`
	`174`	`+ $environment = get_cli_option('env', getenv('LARAVEL_ENV'));`
`175`	`175`
`176`		`- if ( ! isset($environment))`
	`176`	`+ if (empty($environment))`
`177`	`177`	`{`
`178`	`178`	`$environment = Request::detect_env($environments, gethostname());`
`179`	`179`	`}`
`@@ -240,4 +240,4 @@`
`240`	`240`	`foreach ($bundles as $bundle => $config)`
`241`	`241`	`{`
`242`	`242`	`Bundle::register($bundle, $config);`
`243`		`-}`
	`243`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`right:0 !important;`
`14`	`14`	`width:100%;`
`15`	`15`	`z-index: 9999 !important;`
	`16`	`+ color: #000;`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`.anbu-tabs`