1 files changed, 11 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 16d1bef5d..05a9f4833 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -689,16 +689,25 @@ function format_date($timestamp, $type = "medium", $format = "") {
 }
 
 function format_name($object) {
-  global $PHP_SELF;
 
   if ($object->uid && $object->name) {
-    if (strstr($PHP_SELF, "admin")) {
+    if (arg(0) == "admin") {
       $output = l($object->name, "admin/user/edit/$object->uid", array("title" => t("Administer user profile.")));
     }
     else {
       $output = l($object->name, "user/view/$object->uid", array("title" => t("View user profile.")));
     }
   }
+  else if ($object->name) {
+    /*
+    ** Sometimes modules display content composed by people who are
+    ** not registers members of the site (i.e. mailing list or news
+    ** aggregator modules).  This clause enables modules to display
+    ** the true author of the content.
+    */
+
+    $output = $object->name;
+  }
   else {
     $output = t(variable_get(anonymous, "Anonymous"));
   }