summaryrefslogtreecommitdiffstats
path: root/system/core/Router.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-10-07 16:31:40 +0200
committerDerek Jones <derek.jones@ellislab.com>2010-10-07 16:31:40 +0200
commitaa7d3f9c04c165f6514aff58596ad7cff89ebe65 (patch)
tree45dcf3255ecdbf74965a844e7e66a8aac560cdd7 /system/core/Router.php
parentdd6719738936be31cdaa1758ca86d5eb14dcab3d (diff)
parent124ac667046bfb662f4165934d953c0c8bded284 (diff)
Automated merge with https://bitbucket.org/barrymieny/codeigniter
Diffstat (limited to 'system/core/Router.php')
-rw-r--r--system/core/Router.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Router.php b/system/core/Router.php
index 1db1ad836..918ea24bf 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -345,7 +345,7 @@ class CI_Router {
*/
function set_class($class)
{
- $this->class = $class;
+ $this->class = str_replace(array('/', '.'), '', $class);
}
// --------------------------------------------------------------------
@@ -404,7 +404,7 @@ class CI_Router {
*/
function set_directory($dir)
{
- $this->directory = trim($dir, '/').'/';
+ $this->directory = str_replace(array('/', '.'), '', $dir).'/';
}
// --------------------------------------------------------------------