Skip to content

Commit e3755b0

Browse files
committed
updated plugin loaders
1 parent 367e371 commit e3755b0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

system/core/Controller.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ public function autoload_plugins()
4242
if(count($this->autoload['plugins']) > 0) {
4343
foreach($this->autoload['plugins'] as $plugin) {
4444
$plugin_name = ucfirst($plugin);
45-
$this->load->plugin($plugin_name);
46-
$this->$plugin = new $plugin;
45+
$this->$plugin = $this->load->plugin($plugin_name);
4746
}
4847
}
4948
}

system/core/Loader.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public function plugin($plugin, $params = null)
8585
$this->$plugin = new $plugin($params);
8686
}
8787
}
88+
return $this->$plugin;
8889
} elseif(file_exists(SYSTEM_DIR . 'plugins/' . ucfirst($plugin) . '/' . ucfirst($plugin) . '.php') || file_exists(SYSTEM_DIR . 'plugins/' . ucfirst($plugin) . '.php')) {
8990
if(file_exists(SYSTEM_DIR . 'plugins/' . ucfirst($plugin) . '/' . ucfirst($plugin) . '.php')) {
9091
require_once SYSTEM_DIR . 'plugins/' . ucfirst($plugin) . '/' . ucfirst($plugin) . '.php';
@@ -101,6 +102,7 @@ public function plugin($plugin, $params = null)
101102
$this->$plugin = new $plugin($params);
102103
}
103104
}
105+
return $this->$plugin;
104106
} else {
105107
$code = 1003;
106108
$text = 'Plugin bulunamadı';

0 commit comments

Comments
 (0)