From a04f2bd5a2eae55dbbdbbcffbe7b500b689138e7 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 15 Oct 2013 16:08:45 +0200
Subject: not assign object from plugin_load by reference

---
 inc/actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/actions.php')

diff --git a/inc/actions.php b/inc/actions.php
index bf124c887..06499df9c 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -164,7 +164,7 @@ function act_dispatch(){
                 $pluginlist = plugin_list('admin');
                 if (in_array($page, $pluginlist)) {
                     // attempt to load the plugin
-                    if ($plugin =& plugin_load('admin',$page) !== null){
+                    if ($plugin = plugin_load('admin',$page) !== null){
                         /** @var DokuWiki_Admin_Plugin $plugin */
                         if($plugin->forAdminOnly() && !$INFO['isadmin']){
                             // a manager tried to load a plugin that's for admins only
-- 
cgit v1.2.3


From 5da403f17a007f1b202f1c5ea2dbc80ab19d26e8 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 15 Oct 2013 16:26:25 +0200
Subject: fix signatures and old by references

---
 inc/actions.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'inc/actions.php')

diff --git a/inc/actions.php b/inc/actions.php
index 06499df9c..5a59d852d 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -164,7 +164,8 @@ function act_dispatch(){
                 $pluginlist = plugin_list('admin');
                 if (in_array($page, $pluginlist)) {
                     // attempt to load the plugin
-                    if ($plugin = plugin_load('admin',$page) !== null){
+
+                    if (($plugin = plugin_load('admin',$page)) !== null){
                         /** @var DokuWiki_Admin_Plugin $plugin */
                         if($plugin->forAdminOnly() && !$INFO['isadmin']){
                             // a manager tried to load a plugin that's for admins only
-- 
cgit v1.2.3


From 5381a7ee4e6527c7d6d6af67134ef92ba97f8745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 13 Nov 2013 22:52:40 +0200
Subject: remove 'infos' misspelling

http://english.stackexchange.com/questions/117552/why-does-information-not-have-a-plural-form
---
 inc/actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/actions.php')

diff --git a/inc/actions.php b/inc/actions.php
index 5a59d852d..50cbe369f 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -53,7 +53,7 @@ function act_dispatch(){
             }
         }
 
-        //display some infos
+        //display some info
         if($ACT == 'check'){
             check();
             $ACT = 'show';
-- 
cgit v1.2.3