Skip to content
This repository was archived by the owner on Aug 19, 2022. It is now read-only.

Commit e84018a

Browse files
committed
Updated to 1.0.7 version
1 parent 5b4ba66 commit e84018a

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## 1.0.7 - 2017-07-25
4+
5+
* Fixed a bug in `__callstatic()` method. Now save the module id before obtaining the module instance.
6+
37
## 1.0.6 - 2017-06-25
48

59
* Bugs fixed in doAction() method.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eliasis-framework/module",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"description": "PHP library for adding addition of modules for Eliasis Framework.",
55
"type": "library",
66
"keywords": [

src/Module.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,6 @@ private function _getAction($state) {
298298
if (isset(self::$states['action'])) {
299299

300300
$action = self::$states['action'];
301-
302-
} else if (isset($this->module['action'])) {
303-
304-
$action = $this->module['action'];
305301
}
306302

307303
return ($state === 'uninstalled') ? '' : $action;
@@ -333,14 +329,14 @@ private function _doAction($action, $state) {
333329

334330
$Launcher = $that->instance('Launcher', 'controller');
335331

336-
$that->_setAction('');
337-
338-
$that->setState($state);
339-
340332
if (is_object($Launcher) && method_exists($Launcher, $action)) {
341333

342334
call_user_func([$Launcher, $action]);
343335
}
336+
337+
$that->_setAction('');
338+
339+
$that->setState($state);
344340
}
345341

346342
/**
@@ -755,10 +751,10 @@ public static function __callstatic($index, $params = false) {
755751
throw new ModuleException($message . ': ' . $index . '.', 817);
756752
}
757753

758-
$that = self::getInstance();
759-
760754
self::$id = $index;
761755

756+
$that = self::getInstance();
757+
762758
if (!$params) { return $that; }
763759

764760
$method = (isset($params[0])) ? $params[0] : '';

0 commit comments

Comments
 (0)