reapply changes made to core files

Signed-off-by: Florian Pritz <bluewind@server-speed.net>

2 files changed, 4 insertions, 4 deletions

diff --git a/index.php b/index.php
index 6e67c2db5..bfc2ac6dc 100755
--- a/index.php
+++ b/index.php
@@ -33,7 +33,7 @@ if (defined('ENVIRONMENT'))
 	switch (ENVIRONMENT)
 	{
 		case 'development':
-			error_reporting(E_ALL);
+			error_reporting(E_ALL ^ E_NOTICE);
 		break;
 	
 		case 'testing':
@@ -201,4 +201,4 @@ if (defined('ENVIRONMENT'))
 require_once BASEPATH.'core/CodeIgniter'.EXT;
 
 /* End of file index.php */
-/* Location: ./index.php */
\ No newline at end of file
+/* Location: ./index.php */
diff --git a/system/core/URI.php b/system/core/URI.php
index 80dc62e58..b34260836 100755
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -193,7 +193,7 @@ class CI_URI {
 		$uri = parse_url($uri, PHP_URL_PATH);
 
 		// Do some final cleaning of the URI and return it
-		return str_replace(array('//', '../'), '/', trim($uri, '/'));
+		return str_replace(array('//', '../'), '/', ltrim($uri, '/'));
 	}
 
 	// --------------------------------------------------------------------
@@ -620,4 +620,4 @@ class CI_URI {
 // END URI Class
 
 /* End of file URI.php */
-/* Location: ./system/core/URI.php */
\ No newline at end of file
+/* Location: ./system/core/URI.php */