summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/core/Input.php4
-rw-r--r--system/helpers/captcha_helper.php1
2 files changed, 3 insertions, 2 deletions
diff --git a/system/core/Input.php b/system/core/Input.php
index b3bed724f..544b7c08b 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -295,8 +295,8 @@ class CI_Input {
*/
public function input_stream($index = NULL, $xss_clean = NULL)
{
- // The input stream can only be read once, so we'll need to check
- // if we have already done that first.
+ // Prior to PHP 5.6, the input stream can only be read once,
+ // so we'll need to check if we have already done that first.
if ( ! is_array($this->_input_stream))
{
parse_str(file_get_contents('php://input'), $this->_input_stream);
diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index 78eac4be0..74ab24ffb 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -215,6 +215,7 @@ if ( ! function_exists('create_captcha'))
// -----------------------------------
// Generate the image
// -----------------------------------
+ $img_url = rtrim($img_url, '/').'/';
$img_filename = $now.'.jpg';
ImageJPEG($im, $img_path.$img_filename);
$img = '<img src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';