summaryrefslogtreecommitdiff
path: root/includes/function.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/function.inc')
-rw-r--r--includes/function.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/includes/function.inc b/includes/function.inc
index 5c1a3615a..ec3ad0a90 100644
--- a/includes/function.inc
+++ b/includes/function.inc
@@ -1,8 +1,5 @@
<?
-include "includes/database.inc";
-include "includes/watchdog.inc";
-
function id2story($id) {
### Perform query:
$result = db_query("SELECT s.*, u.userid FROM stories s LEFT JOIN users u ON s.author = u.id WHERE s.id = $id");
@@ -69,7 +66,7 @@ function format_username($username, $admin = 0) {
else { global $anonymous; return $anonymous; }
}
-function format_email_address($address) {
+function format_email($address) {
return ($address) ? "<A HREF=\"mailto:$address\">$address</A>" : format_data($address);
}