Merge a91f378 into ae01838

thephpleague · Jan 16, 2015 · 702d057 · 702d057
2 parents ae01838 + a91f378
commit 702d057
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Exception/IDPException.php b/src/Exception/IDPException.php
@@ -12,10 +12,10 @@ public function __construct($result)
 
         $code = isset($result['code']) ? $result['code'] : 0;
 
-        if (isset($result['error'])) {
+        if (isset($result['error']) && $result['error'] !== '') {
             // OAuth 2.0 Draft 10 style
             $message = $result['error'];
-        } elseif (isset($result['message'])) {
+        } elseif (isset($result['message']) && $result['message'] !== '') {
             // cURL style
             $message = $result['message'];
         } else {