From ebf74041efe2bc876be37474beb3f9747fbb7407 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 6 Jul 2011 08:16:31 +0000
Subject: [PATCH] getUserData() does now tollerate missing table columns. This
 makes it very flexible to e.g. absent extensions

---
 inc/libs/refback_functions.php                       |  2 +-
 inc/wrapper-functions.php                            | 12 ++++++++++--
 templates/de/html/member/member_refback_list_row.tpl |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index 1e5778ee41..0911ea9b45 100644
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -290,7 +290,7 @@ function getArrayFromRefbackUserRefs ($userid, $level) {
 
 	// Do we have nickname extension installed?
 	if (isExtensionActive('nickname')) {
-		$add = ", d.nickname";
+		$add = ", d.`nickname`";
 	} // END - if
 
 	// Get refs from database
diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index db62ffb5d1..0084453795 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -951,8 +951,16 @@ function getUserData ($column) {
 		debug_report_bug(__FUNCTION__, __LINE__, 'Current user id is invalid: ' . getCurrentUserId());
 	} // END - if
 
-	// Return the value
-	return $GLOBALS['user_data'][getCurrentUserId()][$column];
+	// Default is empty
+	$data = null;
+
+	if (isset($GLOBALS['user_data'][getCurrentUserId()][$column])) {
+		// Return the value
+		$data = $GLOBALS['user_data'][getCurrentUserId()][$column];
+	} // END - if
+
+	// Return it
+	return $data;
 }
 
 // Checks wether given user data is set to 'Y'
diff --git a/templates/de/html/member/member_refback_list_row.tpl b/templates/de/html/member/member_refback_list_row.tpl
index 490526eb1e..78963e44b3 100644
--- a/templates/de/html/member/member_refback_list_row.tpl
+++ b/templates/de/html/member/member_refback_list_row.tpl
@@ -1,6 +1,6 @@
 <tr>
 	<td align="center" class="{%template,ColorSwitch%} bottom right">
-		$content[refid] ({%pipe,fixEmptyContentToDashes=$content[nickname]%})
+		$content[refid] ({%user,nickname,fixEmptyContentToDashes=$content[refid]%})
 	</td>
 	<td align="center" class="{%template,ColorSwitch%} bottom right">
 		$content[level_refid]
-- 
2.39.5