Setting tag www-register-wizard-4.3-5

[www-register-wizard.git] / libraries / Config.php

diff --git a/libraries/Config.php b/libraries/Config.php
index 027f6bf..4ef2786 100644 (file)
--- a/libraries/Config.php
+++ b/libraries/Config.php
@@ -6,7 +6,7 @@
  *
  * @package            CodeIgniter
  * @author             ExpressionEngine Dev Team
- * @copyright  Copyright (c) 2008, EllisLab, Inc.
+ * @copyright  Copyright (c) 2008 - 2009, EllisLab, Inc.
  * @license            http://codeigniter.com/user_guide/license.html
  * @link               http://codeigniter.com
  * @since              Version 1.0
@@ -203,7 +203,7 @@ class CI_Config {
                else
                {
                        $suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix');
-                       return $this->slash_item('base_url').$this->slash_item('index_page').preg_replace("|^/*(.+?)/*$|", "\\1", $uri).$suffix;
+                       return $this->slash_item('base_url').$this->slash_item('index_page').trim($uri, '/').$suffix; 
                }
        }