Merge branch '3.2/develop' of http://github.com/kohana/core into 3.2/…

…develop

classes/kohana/request.php

@@ -932,23 +932,29 @@ public function param($key = NULL, $default = NULL)
 	 */
 	public function redirect($url = '', $code = 302)
 	{
+		$referrer = $this->uri();
+
+		if (strpos($referrer, '://') === FALSE)
+		{
+			$referrer = URL::site($referrer, TRUE, Kohana::$index_file);
+		}
+
 		if (strpos($url, '://') === FALSE)
 		{
 			// Make the URI into a URL
-			$url = URL::site($url, TRUE);
+			$url = URL::site($url, TRUE, Kohana::$index_file);
 		}
 
-		// Redirect
-		$response = $this->create_response();
-
-		// Set the response status
-		$response->status($code);
-
-		// Set the location header
-		$response->headers('Location', $url);
+		if (($response = $this->response()) === NULL)
+		{
+			$response = $this->create_response();
+		}
 
-		// Send headers
-		$response->send_headers();
+		echo $response->status($code)
+			->headers('Location', $url)
+			->headers('Referer', $referrer)
+			->send_headers()
+			->body();
 
 		// Stop execution
 		exit;

classes/kohana/text.php

@@ -238,14 +238,14 @@ public static function random($type = NULL, $length = 8)
 	 * 
 	 *      $str = Text::ucfirst('content-type'); // returns "Content-Type" 
 	 *
-	 * @param   string    word to transform
+	 * @param   string    string to transform
 	 * @param   string    delemiter to use
 	 * @return  string
 	 */
-	public static function ucfirst($word, $delimiter = '-')
+	public static function ucfirst($string, $delimiter = '-')
 	{
 		// Put the keys back the Case-Convention expected
-		return implode($delimiter, array_map('ucfirst', explode($delimiter, $word)));
+		return implode($delimiter, array_map('ucfirst', explode($delimiter, $string)));
 	}
 
 	/**

guide/kohana/upgrading.md

@@ -78,7 +78,7 @@ In Kohana 3.2, HTTP caching is enabled slightly differently;
 
     // Apply cache to request
     $request = Request::factory('foo/bar',
-        HTTP_Cache::factory(array(), 'memcache'));
+        HTTP_Cache::factory('memcache'));
 
     // In controller, ensure response sets cache control,
     // this will cache the response for one hour