Merge pull request #3039 from mdunisch/develop
Remove error-masking '@' in mysqli_driver (See: #3036)
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 69b91ff..3f7c041 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -76,7 +76,8 @@
'bsdi' => 'BSDi',
'openbsd' => 'OpenBSD',
'gnu' => 'GNU/Linux',
- 'unix' => 'Unknown Unix OS'
+ 'unix' => 'Unknown Unix OS',
+ 'symbian' => 'Symbian OS'
);
diff --git a/system/core/Input.php b/system/core/Input.php
index b3bed72..544b7c0 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -295,8 +295,8 @@
*/
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 78eac4b..74ab24f 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -215,6 +215,7 @@
// -----------------------------------
// 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=" " />';