summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-07-10 22:05:45 -0400
committerFrederic Guillot <fred@kanboard.net>2016-07-10 22:05:45 -0400
commit3813acf199a5873c6f5f8ff945e8a83ea745b8af (patch)
tree61aac96cd4e13ef89912a2d78847ac34545409ef
parentb56295fa7b0c14ac8549b04359c57c05c06fee9f (diff)
Fixed compatibility issue with PHP 5.3 for OAuthUserProvider class
-rw-r--r--ChangeLog4
-rw-r--r--app/User/OAuthUserProvider.php14
2 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 9004af40..8074c3d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@ Improvements:
* Display TOTP issuer for 2FA
+Bug fixes:
+
+* Fixed compatibility issue with PHP 5.3 for OAuthUserProvider class
+
Version 1.0.31
--------------
diff --git a/app/User/OAuthUserProvider.php b/app/User/OAuthUserProvider.php
index dec26250..e5fedcca 100644
--- a/app/User/OAuthUserProvider.php
+++ b/app/User/OAuthUserProvider.php
@@ -13,14 +13,6 @@ use Kanboard\Core\User\UserProviderInterface;
abstract class OAuthUserProvider implements UserProviderInterface
{
/**
- * Get external id column name
- *
- * @access public
- * @return string
- */
- abstract public function getExternalIdColumn();
-
- /**
* User properties
*
* @access protected
@@ -69,7 +61,7 @@ abstract class OAuthUserProvider implements UserProviderInterface
*/
public function getExternalId()
{
- return $this->user['id'];
+ return isset($this->user['id']) ? $this->user['id'] : '';
}
/**
@@ -102,7 +94,7 @@ abstract class OAuthUserProvider implements UserProviderInterface
*/
public function getName()
{
- return $this->user['name'];
+ return isset($this->user['name']) ? $this->user['name'] : '';
}
/**
@@ -113,7 +105,7 @@ abstract class OAuthUserProvider implements UserProviderInterface
*/
public function getEmail()
{
- return $this->user['email'];
+ return isset($this->user['email']) ? $this->user['email'] : '';
}
/**