Skip to content

Commit

Permalink
Merge branch 'master' of github.com:segersjens/CodeIgniter-HMVC-Modules
Browse files Browse the repository at this point in the history
  • Loading branch information
jenssegers committed Jan 18, 2013
2 parents beb2554 + 5572dc2 commit 6d17b4c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ This is the basic structure of a HMVC module:
From within a module you can load its own resources just like you always do. If on the other hand, you want to load resources from another module you can do this by adding the module's name like a directory structure:

class Hello extends MY_Controller {
class Hello extends CI_Controller {
public function index() {
// load a model from the current module
Expand Down Expand Up @@ -76,7 +76,7 @@ To load hierarchical controllers you use the `$this->load->controller()` method.

For example, this is our main controller where we pass the request to a sub-controller in the same module:

class Specials extends MY_Controller {
class Specials extends CI_Controller {
public function index() {
$this->load->controller('blogs/random', array('specials'));
Expand All @@ -86,7 +86,7 @@ For example, this is our main controller where we pass the request to a sub-cont

And the sub-controller contains the real method:

class Blogs extends MY_Controller {
class Blogs extends CI_Controller {

public function random($type) {
...
Expand Down
2 changes: 1 addition & 1 deletion third_party/HMVC/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ function locate($segments) {
$relative = $location;

// Make path relative to controllers directory
$start = rtrim(FCPATH . APPPATH, '/');
$start = rtrim(realpath(FCPATH . APPPATH), '/');
$parts = explode('/', str_replace('\\', '/', $start));

// Iterate all parts and replace absolute part with relative part
Expand Down

0 comments on commit 6d17b4c

Please sign in to comment.