From 1951648b1cacfb48e55795e52187d27a1abb7d94 Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Tue, 5 Oct 2010 21:35:30 +0200
Subject: [PATCH] MDL-24530 Fixed core functions usage during early install phase when the site is not fully set up yet

---
 lib/adminlib.php  |    6 ++++--
 lib/moodlelib.php |   21 ++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/adminlib.php b/lib/adminlib.php
index fc8e3af..2efe8a8 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2605,8 +2605,10 @@ class admin_setting_users_with_capability extends admin_setting_configmultiselec
             '$@NONE@$' => get_string('nobody'),
             '$@ALL@$' => get_string('everyonewhocan', 'admin', get_capability_string($this->capability)),
         );
-        foreach ($users as $user) {
-            $this->choices[$user->username] = fullname($user);
+        if (is_array($users)) {
+            foreach ($users as $user) {
+                $this->choices[$user->username] = fullname($user);
+            }
         }
         return true;
     }
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 00fe962..522a050 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2703,17 +2703,20 @@ function fullname($user, $override=false) {
         $CFG->fullnamedisplay = $SESSION->fullnamedisplay;
     }
 
-    if ($CFG->fullnamedisplay == 'firstname lastname') {
-        return $user->firstname .' '. $user->lastname;
+    if (isset($CFG->fullnamedisplay)) {
 
-    } else if ($CFG->fullnamedisplay == 'lastname firstname') {
-        return $user->lastname .' '. $user->firstname;
+        if ($CFG->fullnamedisplay == 'firstname lastname') {
+            return $user->firstname .' '. $user->lastname;
 
-    } else if ($CFG->fullnamedisplay == 'firstname') {
-        if ($override) {
-            return get_string('fullnamedisplay', '', $user);
-        } else {
-            return $user->firstname;
+        } else if ($CFG->fullnamedisplay == 'lastname firstname') {
+            return $user->lastname .' '. $user->firstname;
+
+        } else if ($CFG->fullnamedisplay == 'firstname') {
+            if ($override) {
+                return get_string('fullnamedisplay', '', $user);
+            } else {
+                return $user->firstname;
+            }
         }
     }
 
-- 
1.7.2.2