MDL-40200 Administration: Return the invalid user message and stop there

To avoid adding duplicate code, 'invalid user' and 'user deleted' checks have been merged together.
moodle · Jun 22, 2013 · da0c3ea · da0c3ea
1 parent e978b66
commit da0c3ea
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/user/profile.php b/user/profile.php
@@ -56,12 +56,14 @@
 }
 
 $userid = $userid ? $userid : $USER->id;       // Owner of the page
-$user = $DB->get_record('user', array('id' => $userid));
+if ((!$user = $DB->get_record('user', array('id' => $userid))) || ($user->deleted)) {
-
-if ($user->deleted) {
     $PAGE->set_context(context_system::instance());
     echo $OUTPUT->header();
-    echo $OUTPUT->notification(get_string('userdeleted'));
+    if (!$user) {
+        echo $OUTPUT->notification(get_string('invaliduser', 'error'));
+    } else {
+        echo $OUTPUT->notification(get_string('userdeleted'));
+    }
     echo $OUTPUT->footer();
     die;
 }