Add default get_email to Duser_Driver

This fixes a possible endless loop when the function is not implemented
in the driver, but the array says it is.

It also allows us to simply call it without checking if it's
implemented.

Signed-off-by: Florian Pritz <bluewind@xinu.at>

2 files changed, 4 insertions, 6 deletions

diff --git a/application/libraries/Duser/Duser.php b/application/libraries/Duser/Duser.php
index 96d61e3cc..ecb0cd9c7 100644
--- a/application/libraries/Duser/Duser.php
+++ b/application/libraries/Duser/Duser.php
@@ -31,6 +31,10 @@ abstract class Duser_Driver extends CI_Driver {
 	public function username_exists($username) {
 		return false;
 	}
+
+	public function get_email($userid) {
+		return null;
+	}
 }
 
 class Duser extends CI_Driver_Library {
@@ -98,8 +102,6 @@ class Duser extends CI_Driver_Library {
 
 	public function get_email($userid)
 	{
-		$this->require_implemented(__FUNCTION__);
-
 		return $this->{$this->_adapter}->get_email($userid);
 	}
 }
diff --git a/application/models/muser.php b/application/models/muser.php
index 2dd7280e8..7a3627b18 100644
--- a/application/models/muser.php
+++ b/application/models/muser.php
@@ -142,10 +142,6 @@ class Muser extends CI_Model {
 
 	function get_email($userid)
 	{
-		if (!$this->duser->is_implemented("get_email")) {
-			return false;
-		}
-
 		return $this->duser->get_email($userid);
 	}