summaryrefslogtreecommitdiff
path: root/includes/function.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2000-10-21 13:59:27 +0000
committerDries Buytaert <dries@buytaert.net>2000-10-21 13:59:27 +0000
commitef43f485756937627f657664a2a7c7f5364e8a53 (patch)
treec700e0cac24f461c45a447a714f0a8d6d20ce888 /includes/function.inc
parentda9675ef0bd18acd7e393460e197b30959ba5735 (diff)
downloadbrdo-ef43f485756937627f657664a2a7c7f5364e8a53.tar.gz
brdo-ef43f485756937627f657664a2a7c7f5364e8a53.tar.bz2
A bunch of internal changes:
- better organisation of include files - renamed a few function to make more sense - small bugfix in the user account registration - ...
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);
}