From 09a45be4b33751c1bd481f4301363db723b6881b Mon Sep 17 00:00:00 2001
From: Derek Jones
Date: Tue, 10 Feb 2009 21:40:21 +0000
Subject: changed exit() to show_error() in _filter_uri()
http://codeigniter.com/bug_tracker/bug/6500/
---
system/libraries/URI.php | 2 +-
user_guide/changelog.html | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index aa2d71e87..b95c74e1a 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -189,7 +189,7 @@ class CI_URI {
if ( ! preg_match("|^[".preg_quote($this->config->item('permitted_uri_chars'))."]+$|i", $str))
{
header('HTTP/1.1 400 Bad Request');
- exit('The URI you submitted has disallowed characters.');
+ show_error('The URI you submitted has disallowed characters.');
}
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index a0a54a33a..aa5f3cb92 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -135,6 +135,7 @@ SVN Revision:
Fixed a bug (#6706) in the Security Helper where xss_clean() was using a deprecated second argument.
Fixed a bug in the URL helper url_title() function where trailing periods were allowed at the end of a URL.
Fixed a bug (#6669) in the Email class when CRLF's are used for the newline character with headers when used with the "mail" protocol.
+ Fixed a bug (#6500) where URI::A_filter_uri() was exit()ing an error instead of using show_error().
Tweaked Typography::auto_typography() for some edge-cases.
--
cgit v1.2.3-24-g4f1b