undefined notifications and version bump

1 files changed, 20 insertions, 4 deletions

diff --git a/Postman/PostmanOAuthToken.php b/Postman/PostmanOAuthToken.php
index 1cd9634..81efbfe 100644
--- a/Postman/PostmanOAuthToken.php
+++ b/Postman/PostmanOAuthToken.php
@@ -45,10 +45,26 @@ if (! class_exists ( 'PostmanOAuthToken.php' )) {
 		 */
 		private function load() {
 			$a = get_option ( PostmanOAuthToken::OPTIONS_NAME );
-			$this->setAccessToken ( $a [PostmanOAuthToken::ACCESS_TOKEN] );
-			$this->setRefreshToken ( $a [PostmanOAuthToken::REFRESH_TOKEN] );
-			$this->setExpiryTime ( $a [PostmanOAuthToken::EXPIRY_TIME] );
-			$this->setVendorName ( $a [PostmanOAuthToken::VENDOR_NAME] );
+
+			if ( ! is_array( $a ) ) {
+			    return;
+            }
+
+			if ( isset( $a [PostmanOAuthToken::ACCESS_TOKEN] ) ) {
+                $this->setAccessToken ( $a [PostmanOAuthToken::ACCESS_TOKEN] );
+            }
+
+            if ( isset( $a [PostmanOAuthToken::REFRESH_TOKEN] ) ) {
+                $this->setRefreshToken($a [PostmanOAuthToken::REFRESH_TOKEN]);
+            }
+
+            if ( isset( $a [PostmanOAuthToken::EXPIRY_TIME] ) ) {
+                $this->setExpiryTime($a [PostmanOAuthToken::EXPIRY_TIME]);
+            }
+
+            if ( isset( $a [PostmanOAuthToken::VENDOR_NAME] ) ) {
+                $this->setVendorName($a [PostmanOAuthToken::VENDOR_NAME]);
+            }
 		}
 		
 		/**