Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Julian Jöris 2011-12-20 16:31:36 +01:00
commit 74934063cc
3 changed files with 3436 additions and 2298 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1000,12 +1000,12 @@ class woocommerce {
function redirect( $location, $status ) { function redirect( $location, $status ) {
global $is_IIS; global $is_IIS;
// IIS fix
if ($is_IIS) session_write_close();
$_SESSION['errors'] = $this->errors; $_SESSION['errors'] = $this->errors;
$_SESSION['messages'] = $this->messages; $_SESSION['messages'] = $this->messages;
// IIS fix
if ($is_IIS) session_write_close();
return $location; return $location;
} }