Merge remote-tracking branch 'upstream/master'

2011-12-20 16:31:36 +01:00 · 2011-12-20 16:31:36 +01:00 · 74934063cc
parent c07d56f5d0 184792e7a6
commit 74934063cc
3 changed files with 3436 additions and 2298 deletions
--- a/languages/woothemes-fr_FR.mo
+++ b/languages/woothemes-fr_FR.mo
--- a/languages/woothemes-fr_FR.po
+++ b/languages/woothemes-fr_FR.po
--- a/woocommerce.php
+++ b/woocommerce.php
@ -999,13 +999,13 @@ class woocommerce {
 	 */
 	function redirect( $location, $status ) {
 		global $is_IIS;
-
-		// IIS fix
-		if ($is_IIS) session_write_close();
-	
+			
 		$_SESSION['errors'] = $this->errors;
 		$_SESSION['messages'] = $this->messages;
 		
+		// IIS fix
+		if ($is_IIS) session_write_close();
+		
 		return $location;
 	}