From daf4c4ff9fc38fad1f54aeddbdf422c29c24f1b4 Mon Sep 17 00:00:00 2001
From: Gerhard <potgieterg@gmail.com>
Date: Tue, 8 Apr 2014 09:35:04 +0200
Subject: [PATCH] Fix _wc_session_expires autoloading

---
 includes/class-wc-session-handler.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/includes/class-wc-session-handler.php b/includes/class-wc-session-handler.php
index ec968ca303a..d8c5ab4cc23 100644
--- a/includes/class-wc-session-handler.php
+++ b/includes/class-wc-session-handler.php
@@ -45,7 +45,13 @@ class WC_Session_Handler extends WC_Session {
 			// Update session if its close to expiring
 			if ( time() > $this->_session_expiring ) {
 				$this->set_session_expiration();
-				update_option( '_wc_session_expires_' . $this->_customer_id, $this->_session_expiration );
+				$session_expiry_option = '_wc_session_expires_' . $this->_customer_id;
+				// Check if option exists first to avoid auloading cleaned up sessions
+				if ( false === get_option( $session_expiry_option ) ) {
+					add_option( $session_expiry_option, $this->_session_expiration, '', 'no' );
+				} else {
+					update_option( $session_expiry_option, $this->_session_expiration );
+				}
 			}
 
 		} else {