Commit 137bb441 authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie
Browse files

Fixed a few cases where warnings about the 'staff' field not being

available for the full_name function were occuring. Removed a very
verbose debug line
parent 9571ce6d
......@@ -60,7 +60,7 @@ if ($control) {
// normal processing (getting friends list)
if (empty($pending)) {
$count = count_records_select('usr_friend', 'usr1 = ? OR usr2 = ?', array($userid, $userid));
$sql = 'SELECT u.id,u.username,u.firstname,u.lastname,u.preferredname
$sql = 'SELECT u.id, u.username, u.firstname, u.lastname, u.preferredname, u.staff
FROM ' . $prefix . 'usr u
WHERE u.id IN (
SELECT (CASE WHEN usr1 = ? THEN usr2 ELSE usr1 END) AS userid
......
......@@ -203,7 +203,6 @@ function get_helpfile_location($plugintype, $pluginname, $form, $element, $page=
// try the current language
$langfile = $location . $lang . '/' . $file;
log_debug($langfile);
if (is_readable($langfile)) {
return $langfile;
}
......
......@@ -105,7 +105,7 @@ class PluginSearchInternal extends PluginSearch {
if ($count > 0) {
$data = get_records_sql_array('
SELECT DISTINCT ON (u.firstname, u.lastname, u.id)
u.id, u.username, u.institution, u.firstname, u.lastname, u.preferredname, u.email
u.id, u.username, u.institution, u.firstname, u.lastname, u.preferredname, u.email, u.staff
FROM ' . $prefix . 'artefact a
INNER JOIN ' . $prefix .'usr u ON u.id = a.owner
WHERE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment