From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 8 Jul 2012 07:30:02 +0000 (+0000)
Subject: - outdated
X-Git-Tag: auto/th/dokuwiki-20120910-1~28
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdokuwiki.git;a=commitdiff_plain;h=d04e8ad3262a99fd26cbdb0960e41f0e3ce41e35

- outdated

Changed files:
    dokuwiki-userinfo.patch -> 1.2
    plugin_exists-check.patch -> 1.2
---

diff --git a/dokuwiki-userinfo.patch b/dokuwiki-userinfo.patch
deleted file mode 100644
index 3a9f7e2..0000000
--- a/dokuwiki-userinfo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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/plugin_exists-check.patch b/plugin_exists-check.patch
deleted file mode 100644
index c7899e4..0000000
--- a/plugin_exists-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dokuwiki-2009-02-14/inc/plugincontroller.class.php~	2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/inc/plugincontroller.class.php	2009-10-13 04:18:14.000000000 +0300
-@@ -79,7 +79,7 @@
-     $dir = $this->get_directory($plugin);
-     $file = $component ? "$type/$component.php" : "$type.php";
- 
--    if (!include_once(DOKU_PLUGIN."$dir/$file")) {
-+    if (!file_exists(DOKU_PLUGIN."$dir/$file") || !include_once(DOKU_PLUGIN."$dir/$file")) {
-       return null;
-     }
-