Skip to content

Update Loader.php #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mitagmio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Loader.php #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions application/third_party/MX/Loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function _init($controller) {
public function _add_module_paths($module = '') {

if (empty($module)) return;

foreach (Modules::$locations as $location => $offset) {

/* only add a module path if it exists */
Expand Down Expand Up @@ -99,7 +99,7 @@ public function database($params = '', $return = FALSE, $active_record = NULL) {
}

/** Load a module helper **/
public function helper($helper) {
public function helper($helper = array()) {

if (is_array($helper)) return $this->helpers($helper);

Expand All @@ -114,12 +114,12 @@ public function helper($helper) {
}

/** Load an array of helpers **/
public function helpers($helpers) {
public function helpers($helpers = array()) {
foreach ($helpers as $_helper) $this->helper($_helper);
}

/** Load a module language file **/
public function language($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') {
public function language($langfile=array(), $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') {
return CI::$APP->lang->load($langfile, $idiom, $return, $add_suffix, $alt_path, $this->_module);
}

Expand All @@ -128,11 +128,12 @@ public function languages($languages) {
}

/** Load a module library **/
public function library($library, $params = NULL, $object_name = NULL) {
public function library($library = '', $params = NULL, $object_name = NULL) {

if (is_array($library)) return $this->libraries($library);
if (is_array($library)) return $this->libraries($library);

$class = strtolower(end(explode('/', $library)));
$explode = explode('/', $library);
$class = strtolower(end($explode));

if (isset($this->_ci_classes[$class]) AND $_alias = $this->_ci_classes[$class])
return CI::$APP->$_alias;
Expand Down Expand Up @@ -174,8 +175,10 @@ public function libraries($libraries) {
public function model($model, $object_name = NULL, $connect = FALSE) {

if (is_array($model)) return $this->models($model);

($_alias = $object_name) OR $_alias = end(explode('/', $model));

$explode = explode('/', $model);

($_alias = $object_name) OR $_alias = end($explode);

if (in_array($_alias, $this->_ci_models, TRUE))
return CI::$APP->$_alias;
Expand Down Expand Up @@ -218,7 +221,8 @@ public function module($module, $params = NULL) {

if (is_array($module)) return $this->modules($module);

$_alias = strtolower(end(explode('/', $module)));
$explode = explode('/', $module);
$_alias = strtolower(end($explode));
CI::$APP->$_alias = Modules::load(array($module => $params));
return CI::$APP->$_alias;
}
Expand Down Expand Up @@ -258,7 +262,7 @@ public function view($view, $vars = array(), $return = FALSE) {

public function _ci_is_instance() {}

public function _ci_get_component($component) {
public function &_ci_get_component($component) {
return CI::$APP->$component;
}

Expand Down Expand Up @@ -379,4 +383,4 @@ public function _autoloader($autoload) {
}

/** load the CI class for Modular Separation **/
(class_exists('CI', FALSE)) OR require dirname(__FILE__).'/Ci.php';
(class_exists('CI', FALSE)) OR require dirname(__FILE__).'/Ci.php';