post() will now strictly return $_POST variables, use the input() hel…

…per to return general input values.
octobercms · Feb 14, 2015 · 952a7ee · 952a7ee
1 parent d855074
commit 952a7ee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/Support/Str.php b/src/Support/Str.php
@@ -64,6 +64,9 @@ public static function evalHtmlArray($string)
     {
         $result = [$string];
 
+        if (strpbrk($string, '[]') === false)
+            return $result;
+
         if (preg_match('/^([^\]]+)(?:\[(.+)\])+$/', $string, $matches)) {
             if (count($matches) < 2)
                 return $result;

diff --git a/src/Support/helpers.php b/src/Support/helpers.php
@@ -23,21 +23,26 @@ function input($name = null, $default = null)
         /*
          * Array field name, eg: field[key][key2][key3]
          */
-        $keyParts = October\Rain\Support\Str::evalHtmlArray($name);
-        $dottedName = implode('.', $keyParts);
-        return Input::get($dottedName, $default);
+        $name = implode('.', Str::evalHtmlArray($name));
+        return Input::get($name, $default);
     }
 }
 
 if (!function_exists('post'))
 {
     /**
-     * Identical function to input(), however may be restricted 
-     * to $_POST values in future.
+     * Identical function to input(), however restricted to $_POST values.
      */
     function post($name = null, $default = null)
     {
-        return input($name, $default);
+        if ($name === null)
+            return $_POST;
+
+        /*
+         * Array field name, eg: field[key][key2][key3]
+         */
+        $name = implode('.', Str::evalHtmlArray($name));
+        return array_get($_POST, $name, $default);
     }
 }
 
@@ -55,9 +60,8 @@ function get($name = null, $default = null)
         /*
          * Array field name, eg: field[key][key2][key3]
          */
-        $keyParts = October\Rain\Support\Str::evalHtmlArray($name);
-        $dottedName = implode('.', $keyParts);
-        return array_get($_GET, $dottedName, $default);
+        $name = implode('.', Str::evalHtmlArray($name));
+        return array_get($_GET, $name, $default);
     }
 }