Fixed: PHP warning.

Fixed: incorrect data extraction on empty RAW payload.

Author: dave83649

src/Processor.php

@@ -103,9 +103,8 @@ public function __get($name)
     public function launch($mustExit = true)
     {
         // Determine if the user is temporarily blocked from the site before we do anything else.
-        if (
-            $this->extension->isBlocked($this->autoblockMinutes, $this->autoblockTime, $this->autoblockAttempts) && !$this->extension->canBypass($this->mustUsePluginCall)
-        ) {
+        $isWhitelisted = $this->extension->canBypass($this->mustUsePluginCall);
+        if (!$isWhitelisted && $this->extension->isBlocked($this->autoblockMinutes, $this->autoblockTime, $this->autoblockAttempts)) {
             $this->extension->forceExit(22);
         }
 
@@ -119,9 +118,6 @@ public function launch($mustExit = true)
             return true;
         }
 
-        // Determine if the current request is whitelisted or not.
-        $isWhitelisted = $this->extension->canBypass($this->mustUsePluginCall);
-
         // Merge the rules together. First iterate through the whitelist rules because
         // we want to whitelist the request if there's a whitelist rule match.
         $rules = array_merge($this->whitelistRules, $this->firewallRules);

src/Request.php

@@ -118,7 +118,7 @@ public function getParameterValues($parameter, $data = [])
 
                 // If it's not an array, no need to continue.
                 if (!is_array($data)) {
-                    return [$data];
+                    $data = [$data];
                 }
             default:
                 break;
@@ -412,6 +412,12 @@ public function getShortcodeAtts($value)
 
             // Merge together if the shortcode occurs more than once.
             if (isset($return[$shortcode[2]])) {
+
+                // Shortcode index must not be a string.
+                if (is_string($return[$shortcode[2]])) {
+                    continue;
+                }
+
                 $atts = @\shortcode_parse_atts($shortcode[3]);
                 foreach ($atts as $key => $value) {
                     if (isset($return[$shortcode[2]][$key])) {