From 7ef8e99fe605c5da36ab6b5d317b22fcd17f665b Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Thu, 22 Aug 2013 01:01:41 -0700
Subject: Fix CodeSniffer violations

Change indentation to ensure code confirms to CodeSniffer rules.
---
 inc/html.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index a2a726406..03e9dc751 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1240,20 +1240,20 @@ function html_diff($text='',$intro=true,$type=null){
 }
 
 function html_insert_softbreaks($diffhtml) {
-  // search the diff html string for both:
-  // - html tags, so these can be ignored
-  // - long strings of characters without breaking characters
-  return preg_replace_callback('/<[^>]*>|[^<> ]{12,}/','html_softbreak_callback',$diffhtml);
+    // search the diff html string for both:
+    // - html tags, so these can be ignored
+    // - long strings of characters without breaking characters
+    return preg_replace_callback('/<[^>]*>|[^<> ]{12,}/','html_softbreak_callback',$diffhtml);
 }
 
 function html_softbreak_callback($match){
-  // if match is an html tag, return it intact
-  if ($match[0]{0} == '<') return $match[0];
+    // if match is an html tag, return it intact
+    if ($match[0]{0} == '<') return $match[0];
 
-  // its a long string without a breaking character,
-  // make certain characters into breaking characters by inserting a
-  // breaking character (zero length space, U+200B / #8203) in front them.
-  $regex = <<< REGEX
+    // its a long string without a breaking character,
+    // make certain characters into breaking characters by inserting a
+    // breaking character (zero length space, U+200B / #8203) in front them.
+    $regex = <<< REGEX
 (?(?=                                 # start a conditional expression with a positive look ahead ...
 &\#?\\w{1,6};)                        # ... for html entities - we don't want to split them (ok to catch some invalid combinations)
 &\#?\\w{1,6};                         # yes pattern - a quicker match for the html entity, since we know we have one
@@ -1262,7 +1262,7 @@ function html_softbreak_callback($match){
 )+                                    # end conditional expression
 REGEX;
 
-  return preg_replace('<'.$regex.'>xu','\0&#8203;',$match[0]);
+    return preg_replace('<'.$regex.'>xu','\0&#8203;',$match[0]);
 }
 
 /**
-- 
cgit v1.2.3


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/html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index 03e9dc751..68ca364f1 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1669,7 +1669,7 @@ function html_admin(){
     $menu = array();
     foreach ($pluginlist as $p) {
         /** @var DokuWiki_Admin_Plugin $obj */
-        if($obj =& plugin_load('admin',$p) === null) continue;
+        if($obj = plugin_load('admin',$p) === null) continue;
 
         // check permissions
         if($obj->forAdminOnly() && !$INFO['isadmin']) continue;
-- 
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/html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index 68ca364f1..2d7216a45 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1661,7 +1661,7 @@ function html_admin(){
     global $ID;
     global $INFO;
     global $conf;
-    /** @var auth_basic $auth */
+    /** @var DokuWiki_Auth_Plugin $auth */
     global $auth;
 
     // build menu of admin functions from the plugins that handle them
@@ -1669,7 +1669,7 @@ function html_admin(){
     $menu = array();
     foreach ($pluginlist as $p) {
         /** @var DokuWiki_Admin_Plugin $obj */
-        if($obj = plugin_load('admin',$p) === null) continue;
+        if(($obj = plugin_load('admin',$p)) === null) continue;
 
         // check permissions
         if($obj->forAdminOnly() && !$INFO['isadmin']) continue;
-- 
cgit v1.2.3


From 61e0b2f8bbbac3ec582aa287e110b304a3986229 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 18 Oct 2013 12:47:55 +0100
Subject: comment improvements

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

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index 03e9dc751..a13c9e58c 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -428,7 +428,7 @@ function html_revisions($first=0, $media_id = false){
     global $conf;
     global $lang;
     $id = $ID;
-    /* we need to get one additionally log entry to be able to
+    /* we need to get one additional log entry to be able to
      * decide if this is the last page or is there another one.
      * see html_recent()
      */
-- 
cgit v1.2.3