]>
Commit | Line | Data |
---|---|---|
b1da5742 ER |
1 | --- dokuwiki-2010-11-07/inc/mail.php 2010-11-29 20:50:39.364391752 +0200 |
2 | +++ dokuwiki/inc/mail.php 2010-11-08 22:22:55.929653976 +0200 | |
3 | @@ -37,12 +37,12 @@ | |
4 | */ | |
5 | function mail_setup(){ | |
6 | global $conf; | |
7 | - global $INFO; | |
8 | + global $USERINFO; | |
9 | ||
10 | $replace = array(); | |
11 | ||
12 | - if(!empty($INFO['userinfo']['mail'])){ | |
13 | - $replace['@MAIL@'] = $INFO['userinfo']['mail']; | |
14 | + if(!empty($USERINFO['mail'])){ | |
15 | + $replace['@MAIL@'] = $USERINFO['mail']; | |
16 | }else{ | |
17 | $replace['@MAIL@'] = 'noreply@'.parse_url(DOKU_URL,PHP_URL_HOST); | |
18 | } | |
19 | @@ -53,8 +53,8 @@ | |
20 | $replace['@USER@'] = 'noreply'; | |
21 | } | |
22 | ||
23 | - if(!empty($INFO['userinfo']['name'])){ | |
24 | - $replace['@NAME@'] = $INFO['userinfo']['name']; | |
25 | + if(!empty($USERINFO['name'])){ | |
26 | + $replace['@NAME@'] = $USERINFO['name']; | |
27 | }else{ | |
28 | $replace['@NAME@'] = ''; | |
29 | } |