summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Persaud <arun@nubati.net>2010-04-19 19:06:20 -0700
committerArun Persaud <arun@nubati.net>2010-04-19 19:06:20 -0700
commit761622f46541afbaf2303a791595f6595f3208eb (patch)
treeaf257eeec5211dbe1c49f18326be48c4a375c729
parent768bf4fe0ece26aa1f24e5f248e675337ee55b2b (diff)
parent07cd86af6d50e786e40ef876106afef7b4be378d (diff)
downloade-DoKo-761622f46541afbaf2303a791595f6595f3208eb.tar.gz
e-DoKo-761622f46541afbaf2303a791595f6595f3208eb.tar.bz2
e-DoKo-761622f46541afbaf2303a791595f6595f3208eb.zip
Merge branch 'master' of /home/arun/nubati.net/git/e-DoKo
-rw-r--r--digest.php5
-rw-r--r--include/functions.php5
2 files changed, 5 insertions, 5 deletions
diff --git a/digest.php b/digest.php
index cb3409f..5335262 100644
--- a/digest.php
+++ b/digest.php
@@ -39,6 +39,8 @@ if(isset($_SERVER['REMOTE_ADDR']))
/* get userid for users that have digest set != digest-off */
$users = DB_get_digest_users();
+global $WIKI;
+
global $defaulttimezone;
foreach($users as $uid)
{
@@ -107,8 +109,7 @@ foreach($users as $uid)
"-- \n".
"You can change your mail delivery mode in the preference menu.\n".
'web: http://doko.nubati.net '.
- 'help: http://wiki.nubati.net/EmailDoko '.
- 'bugs: http://wiki.nubati.net/EmailDokoIssues';
+ "help, bugs, etc.: $WIKI";
$subject = "$EmailName Digest";
diff --git a/include/functions.php b/include/functions.php
index 04d1bde..98feae4 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -75,7 +75,7 @@ function config_check()
function mymail($uid,$subject,$message)
{
- global $EmailName;
+ global $EmailName,$WIKI;
/* do we send the email right away or save it in the database? */
$send_now = 1;
@@ -89,8 +89,7 @@ function mymail($uid,$subject,$message)
"-- \n".
"You can change your mail delivery mode in the preference menu.\n".
'web: http://doko.nubati.net '.
- 'help: http://wiki.nubati.net/EmailDoko '.
- 'bugs: http://wiki.nubati.net/EmailDokoIssues';
+ "help, bugs, etc.: $WIKI";
if(is_array($uid))
{