- use $USERINFO in early init (fixed in git already); 2

Changed files:
    dokuwiki-userinfo.patch -> 1.1
    dokuwiki.spec -> 1.89

diff --git a/dokuwiki-userinfo.patch b/dokuwiki-userinfo.patch
new file mode 100644 (file)
index 0000000..3a9f7e2
--- /dev/null
+++ b/dokuwiki-userinfo.patch
@@ -0,0 +1,29 @@
+--- dokuwiki-2010-11-07/inc/mail.php   2010-11-29 20:50:39.364391752 +0200
++++ dokuwiki/inc/mail.php      2010-11-08 22:22:55.929653976 +0200
+@@ -37,12 +37,12 @@
+  */
+ function mail_setup(){
+     global $conf;
+-    global $INFO;
++    global $USERINFO;
+ 
+     $replace = array();
+ 
+-    if(!empty($INFO['userinfo']['mail'])){
+-        $replace['@MAIL@'] = $INFO['userinfo']['mail'];
++    if(!empty($USERINFO['mail'])){
++        $replace['@MAIL@'] = $USERINFO['mail'];
+     }else{
+         $replace['@MAIL@'] = 'noreply@'.parse_url(DOKU_URL,PHP_URL_HOST);
+     }
+@@ -53,8 +53,8 @@
+         $replace['@USER@'] = 'noreply';
+     }
+ 
+-    if(!empty($INFO['userinfo']['name'])){
+-        $replace['@NAME@'] = $INFO['userinfo']['name'];
++    if(!empty($USERINFO['name'])){
++        $replace['@NAME@'] = $USERINFO['name'];
+     }else{
+         $replace['@NAME@'] = '';
+     }

diff --git a/dokuwiki.spec b/dokuwiki.spec
index cd42b612ae96ee2f6667545bd5e7e2eb4d534cee..8ee9f6ab37c10bbccf1c854bbadfc34b5a00c18d 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -6,7 +6,7 @@ Summary:        PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -47,6 +47,7 @@ Patch19:      pld-branding.patch
 Patch20:       fixprivilegeescalationbug.diff
 Patch21:       task-1821.patch
 Patch22:       adldap.patch
+Patch23:       dokuwiki-userinfo.patch
 URL:           http://www.dokuwiki.org/dokuwiki
 BuildRequires: fslint
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -136,6 +137,7 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %patch66 -p1