diff options
author | John de Kroon <johndekroon@gmail.com> | 2018-09-03 11:21:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-03 11:21:33 +0200 |
commit | 8abd21b17e9da1f3808f537643bfeaba0a790837 (patch) | |
tree | 26119f00ab2a4931a54d2b55874cdc8d5217d4d1 /system/core/Input.php | |
parent | 9bf6753a1bcd54d6ca69fc194efc9f982661aa66 (diff) | |
parent | 8537680955fbc045bf8011a2915e18583a91d52f (diff) |
Merge pull request #1 from bcit-ci/develop
Update from source
Diffstat (limited to 'system/core/Input.php')
-rw-r--r-- | system/core/Input.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index 97a6be78f..7f5f2e91d 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -29,8 +29,8 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) - * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/) - * @license http://opensource.org/licenses/MIT MIT License + * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (https://bcit.ca/) + * @license https://opensource.org/licenses/MIT MIT License * @link https://codeigniter.com * @since Version 1.0.0 * @filesource @@ -212,9 +212,8 @@ class CI_Input { */ public function post_get($index, $xss_clean = FALSE) { - return isset($_POST[$index]) - ? $this->post($index, $xss_clean) - : $this->get($index, $xss_clean); + $output = $this->post($index, $xss_clean); + return isset($output) ? $output : $this->get($index, $xss_clean); } // -------------------------------------------------------------------- @@ -228,9 +227,8 @@ class CI_Input { */ public function get_post($index, $xss_clean = FALSE) { - return isset($_GET[$index]) - ? $this->get($index, $xss_clean) - : $this->post($index, $xss_clean); + $output = $this->get($index, $xss_clean); + return isset($output) ? $output : $this->post($index, $xss_clean); } // -------------------------------------------------------------------- |