Merge remote branch 'origin/3.1/develop' into 3.1/develop

Conflicts: guide/kohana/bootstrap.md guide/kohana/errors.md guide/kohana/security/deploying.md
kohana · Feb 2, 2011 · 0de05f7 · 0de05f7
2 parents 8ac03f9 + 67e41ee
commit 0de05f7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/classes/kohana/controller/rest.php b/classes/kohana/controller/rest.php
@@ -74,7 +74,7 @@ public function before()
 	 */
 	public function after()
 	{
-		if (in_array($this->request->method(), array(
+		if (in_array(Arr::get($_SERVER, 'HTTP_X_HTTP_METHOD_OVERRIDE', $this->request->method()), array(
 			Http_Request::PUT,
 			Http_Request::POST,
 			Http_Request::DELETE)))

diff --git a/classes/kohana/response.php b/classes/kohana/response.php
@@ -652,7 +652,7 @@ public function send_file($filename, $download = NULL, array $options = NULL)
 				if (is_object(Kohana::$log))
 				{
 					// Add this exception to the log
-					Kohana::$log->add(Kohana::ERROR, $error);
+					Kohana::$log->add(Log::ERROR, $error);
 
 					// Make sure the logs are written
 					Kohana::$log->write();
@@ -911,4 +911,4 @@ protected function _calculate_byte_range($size)
 
 		return array($start, $end);
 	}
-} // End Kohana_Response
+} // End Kohana_Response
diff --git a/classes/kohana/session.php b/classes/kohana/session.php
@@ -368,7 +368,7 @@ public function write()
 		catch (Exception $e)
 		{
 			// Log & ignore all errors when a write fails
-			Kohana::$log->add(Kohana::ERROR, Kohana_Exception::text($e))->write();
+			Kohana::$log->add(Log::ERROR, Kohana_Exception::text($e))->write();
 
 			return FALSE;
 		}

diff --git a/guide/kohana/bootstrap.md b/guide/kohana/bootstrap.md
@@ -108,4 +108,4 @@ Route::set('default', '(<controller>(/<action>(/<id>)))')
 		'controller' => 'welcome',
 		'action'     => 'index',
 	));
-~~~
+~~~
diff --git a/guide/kohana/errors.md b/guide/kohana/errors.md
@@ -82,4 +82,4 @@ There is no default method to handle these errors in Kohana. It's recommended th
 
 And put something like this in your bootstrap to register the handler.
 
-	set_exception_handler(array('Foobar_Exception_Handler', 'handle'));
+	set_exception_handler(array('Foobar_Exception_Handler', 'handle'));
diff --git a/guide/kohana/tutorials/error-pages.md b/guide/kohana/tutorials/error-pages.md
@@ -20,7 +20,7 @@ Our custom exception handler is self explanatory.
 		}
 		else
 		{
-			Kohana::$log->add(Kohana::ERROR, Kohana::exception_text($e));
+			Kohana::$log->add(Log::ERROR, Kohana::exception_text($e));
 
 			$attributes = array
 			(