Revert "Replace global user functions with WT_User class" - submitted to wrong branch

This reverts commit 04e895d26b4a0f606b8f83488ecb32127df081cf.

7 files changed, 7 insertions, 7 deletions

diff --git a/themes/_administration/header.php b/themes/_administration/header.php
index 86b7c4e7d4..d647f2aed5 100644
--- a/themes/_administration/header.php
+++ b/themes/_administration/header.php
@@ -108,7 +108,7 @@ if (WT_USER_IS_ADMIN) {
 echo '<li><ul>';
 //-- gedcom list
 foreach (WT_Tree::getAll() as $tree) {
-	if (WT_User::currentUser()->isManager($tree)) {
+	if (userGedcomAdmin(WT_USER_ID, $tree->tree_id)) {
 		// Add a title="" element, since long tree titles are cropped
 		echo
 			'<li><span><a ', (WT_SCRIPT_NAME=='admin_trees_config.php' && WT_GED_ID==$tree->tree_id ? 'class="current" ' : ''), 'href="admin_trees_config.php?ged='.$tree->tree_name_url.'" title="', WT_Filter::escapeHtml($tree->tree_title), '" dir="auto">', $tree->tree_title_html,
diff --git a/themes/clouds/header.php b/themes/clouds/header.php
index 5b94b2fb1e..24d5bba2e1 100644
--- a/themes/clouds/header.php
+++ b/themes/clouds/header.php
@@ -109,7 +109,7 @@ if  ($view!='simple') { // Use "simple" headers for popup windows
 	'<div id="menu-right">',
 	'<ul class="makeMenu">';
 	if (WT_USER_ID) {
-		echo '<li><a href="edituser.php" class="link">', WT_Filter::escapeHtml(WT_User::currentUser()->getRealName()), '</a></li><li>', logout_link(), '</li>';
+		echo '<li><a href="edituser.php" class="link">', getUserFullName(WT_USER_ID), '</a></li><li>', logout_link(), '</li>';
 		if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 			echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\', chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
 		}
diff --git a/themes/colors/header.php b/themes/colors/header.php
index 09d35d9f48..a2db3b4315 100644
--- a/themes/colors/header.php
+++ b/themes/colors/header.php
@@ -80,7 +80,7 @@ if  ($view!='simple') { // Use "simple" headers for popup windows
 	'<ul class="makeMenu">';
 
 	if (WT_USER_ID) {
-		echo '<li><a href="edituser.php" class="link">', WT_Filter::escapeHtml(WT_User::currentUser()->getRealName()), '</a></li><li>', logout_link(), '</li>';
+		echo '<li><a href="edituser.php" class="link">', getUserFullName(WT_USER_ID), '</a></li><li>', logout_link(), '</li>';
 		if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 			echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
 		}
diff --git a/themes/fab/header.php b/themes/fab/header.php
index 64b3ab406f..48d231e143 100644
--- a/themes/fab/header.php
+++ b/themes/fab/header.php
@@ -63,7 +63,7 @@ if ($view!='simple') { // Use “simple” headers for popup windows
 	echo '<div id="header" class="block">';
 	echo '<div id="header-user-links"><ul class="makeMenu">';
 	if (WT_USER_ID) {
-		echo '<li><a href="edituser.php">', WT_Filter::escapeHtml(WT_User::currentUser()->getRealName()), '</a></li> <li>', logout_link(), '</li>';
+		echo '<li><a href="edituser.php">', getUserFullName(WT_USER_ID), '</a></li> <li>', logout_link(), '</li>';
 		if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 			echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
 		}
diff --git a/themes/minimal/header.php b/themes/minimal/header.php
index b69f41ba9b..3024c204d9 100644
--- a/themes/minimal/header.php
+++ b/themes/minimal/header.php
@@ -66,7 +66,7 @@ if ($view!='simple') {
 	echo '<div id="header-user-links">';
 	echo '<ul class="makeMenu">';
 	if (WT_USER_ID) {
-		echo '<li><a href="edituser.php">', WT_Filter::escapeHtml(WT_User::currentUser()->getRealName()), '</a></li> <li>', logout_link(), '</li>';
+		echo '<li><a href="edituser.php">', getUserFullName(WT_USER_ID), '</a></li> <li>', logout_link(), '</li>';
 		if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 			echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
 		}
diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php
index b404fe465d..63491f39a5 100644
--- a/themes/webtrees/header.php
+++ b/themes/webtrees/header.php
@@ -58,7 +58,7 @@ $this
 			<li>
 				<?php
 				if (WT_USER_ID) {
-					echo '<a href="edituser.php">', WT_I18N::translate('Logged in as '), ' ', WT_Filter::escapeHtml(WT_User::currentUser()->getRealName()), '</a></li> <li>', logout_link();
+					echo '<a href="edituser.php">', WT_I18N::translate('Logged in as '), ' ', getUserFullName(WT_USER_ID), '</a></li> <li>', logout_link();
 				} else {
 					echo login_link();
 				}
diff --git a/themes/xenea/header.php b/themes/xenea/header.php
index 984c3067f0..aa66d67a17 100644
--- a/themes/xenea/header.php
+++ b/themes/xenea/header.php
@@ -97,7 +97,7 @@ if ($view!='simple') { // Use "simple" headers for popup windows
 		'<div id="login-menu">',
 			'<ul class="makeMenu">';
 				if (WT_USER_ID) {
-					echo '<li><a href="edituser.php">', WT_Filter::escapeHtml(WT_User::currentUser()->getRealName()), '</a></li> <li>', logout_link(), '</li>';
+					echo '<li><a href="edituser.php">', getUserFullName(WT_USER_ID), '</a></li> <li>', logout_link(), '</li>';
 					if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 						echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', chan_window_specs); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>';
 					}