From 38c7b2bfd3f3a442eacfde3aa700a41cce83c460 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Thu, 1 Aug 2013 20:52:09 +0200
Subject: Fix loading for helper components with loadHelper()

The check if the plugin is enabled is done later in the plugin
controller anyway.
---
 inc/plugin.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'inc/plugin.php')

diff --git a/inc/plugin.php b/inc/plugin.php
index 4d3d45f62..422b82534 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -199,11 +199,7 @@ class DokuWiki_Plugin {
      * @return  object  helper plugin object
      */
     function loadHelper($name, $msg = true){
-        if (!plugin_isdisabled($name)){
-            $obj = plugin_load('helper',$name);
-        }else{
-            $obj = null;
-        }
+        $obj = plugin_load('helper',$name);
         if (is_null($obj) && $msg) msg("Helper plugin $name is not available or invalid.",-1);
         return $obj;
     }
-- 
cgit v1.2.3


From 0b70fdc31cd6798a034541f482504328205715e7 Mon Sep 17 00:00:00 2001
From: hArpanet <github@harpanet.com>
Date: Fri, 20 Sep 2013 17:34:29 +0100
Subject: Bugfix: DOKU_CONF path

Remove extraneous slash
---
 inc/plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/plugin.php')

diff --git a/inc/plugin.php b/inc/plugin.php
index 422b82534..dccd37bd9 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -97,7 +97,7 @@ class DokuWiki_Plugin {
     function localFN($id) {
         global $conf;
         $plugin = $this->getPluginName();
-        $file = DOKU_CONF.'/plugin_lang/'.$plugin.'/'.$conf['lang'].'/'.$id.'.txt';
+        $file = DOKU_CONF.'plugin_lang/'.$plugin.'/'.$conf['lang'].'/'.$id.'.txt';
         if (!@file_exists($file)){
             $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt';
             if(!@file_exists($file)){
-- 
cgit v1.2.3