packages: dokuwiki/dokuwiki.spec, dokuwiki/dokuwiki-userinfo.patch (NEW) - ...

[glen]

Author: glen                         Date: Tue Dec 14 16:50:25 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use $USERINFO in early init (fixed in git already); 2

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.88 -> 1.89) , dokuwiki-userinfo.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.88 packages/dokuwiki/dokuwiki.spec:1.89
--- packages/dokuwiki/dokuwiki.spec:1.88	Sun Nov  7 22:11:17 2010
+++ packages/dokuwiki/dokuwiki.spec	Tue Dec 14 17:50:20 2010
@@ -7,7 +7,7 @@
 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
@@ -48,6 +48,7 @@
 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
@@ -137,6 +138,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %patch66 -p1
 
@@ -379,6 +381,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89  2010/12/14 16:50:20  glen
+- use $USERINFO in early init (fixed in git already); 2
+
 Revision 1.88  2010/11/07 21:11:17  glen
 - up to 2010-11-07 release
 

================================================================
Index: packages/dokuwiki/dokuwiki-userinfo.patch
diff -u /dev/null packages/dokuwiki/dokuwiki-userinfo.patch:1.1
--- /dev/null	Tue Dec 14 17:50:25 2010
+++ packages/dokuwiki/dokuwiki-userinfo.patch	Tue Dec 14 17:50:20 2010
@@ -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@'] = '';
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.88&r2=1.89&f=u