summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-02-15 22:39:25 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-02-15 22:39:25 +0100
commit44f210543cf6adcac99264d973dd73ea1b0ab37e (patch)
treebb0c72ef5e18cc64324916e6a4f44c2a1c26d09d /system/core
parentd98325db8019d7ed71906d63442c694da038fcf7 (diff)
Input post() and get() will now return a full array if the first argument is not provided.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Input.php36
1 files changed, 15 insertions, 21 deletions
diff --git a/system/core/Input.php b/system/core/Input.php
index ea5b248cf..16b295546 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -109,22 +109,19 @@ class CI_Input {
* @param bool
* @return string
*/
- function get($index = '', $xss_clean = FALSE)
+ function get($index = NULL, $xss_clean = FALSE)
{
- // check if a field has been entered
- if( empty($index) AND is_array($_GET) AND count($_GET) )
+ // Check if a field has been provided
+ if ($index === NULL AND ! empty($_GET))
{
- // no field entered - return all fields
-
- $all_get_fields = array();
+ $get = array();
// loop through the full _GET array
- foreach( $_GET as $key )
+ foreach (array_keys($_GET) as $key)
{
- $all_get_fields[$key] = $this->_fetch_from_array($_GET, $key, $xss_clean);
+ $get[$key] = $this->_fetch_from_array($_GET, $key, $xss_clean);
}
- return $all_get_fields;
-
+ return $get;
}
return $this->_fetch_from_array($_GET, $index, $xss_clean);
@@ -140,22 +137,19 @@ class CI_Input {
* @param bool
* @return string
*/
- function post($index = '', $xss_clean = FALSE)
+ function post($index = NULL, $xss_clean = FALSE)
{
- // check if a field has been entered
- if( empty($index) AND is_array($_POST) AND count($_POST) )
+ // Check if a field has been provided
+ if ($index === NULL AND ! empty($_POST))
{
- // no field entered - return all fields
+ $post = array();
- $all_post_fields = array();
-
- // loop through the full _POST array
- foreach( $_POST as $key )
+ // Loop through the full _POST array and return it
+ foreach (array_keys($_POST) as $key)
{
- $all_post_fields[$key] = $this->_fetch_from_array($_POST, $key, $xss_clean);
+ $post[$key] = $this->_fetch_from_array($_POST, $key, $xss_clean);
}
- return $all_post_fields;
-
+ return $post;
}
return $this->_fetch_from_array($_POST, $index, $xss_clean);