Skip to content
This repository was archived by the owner on Dec 6, 2019. It is now read-only.

Commit 99b5c14

Browse files
committed
Merge pull request #117 from agarzon/master
Global variables can't be used as parameters, they are global already.
2 parents 767c7ab + 02758aa commit 99b5c14

File tree

3 files changed

+284
-284
lines changed

3 files changed

+284
-284
lines changed

Diff for: core/classes/CodonModule.class.php

+19-19
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@
4242
*/
4343
class CodonModule
4444
{
45-
public static $post;
46-
public static $get;
47-
public static $controller;
48-
public static $activeModule;
45+
public $post;
46+
public $get;
47+
public $controller;
48+
public $activeModule;
4949
public $action;
50-
50+
5151
public $title;
52-
52+
5353
public function __construct()
5454
{
55-
55+
5656
}
57-
57+
5858
/**
5959
* Initialize the parent class. Called by the MainController
6060
* when the module is created
@@ -63,55 +63,55 @@ public function __construct()
6363
public function init($module_name='')
6464
{
6565
$module_name = strtolower($module_name);
66-
66+
6767
$this->post = Vars::$post;
6868
$this->get = CodonRewrite::$get;
6969
$this->request = Vars::$request;
7070
$this->controller = CodonRewrite::$controller;
71-
71+
7272
$this->init = true;
7373
$this->activeModule = MainController::$activeModule;
7474
}
75-
75+
7676
public function config($setting)
7777
{
7878
return Config::Get($setting);
7979
}
80-
80+
8181
public function get($name)
8282
{
8383
return Template::Get($name, true);
8484
}
85-
85+
8686
public function set($name, $value)
8787
{
8888
Template::Set($name, $value);
8989
}
90-
90+
9191
public function show($tpl)
9292
{
9393
Template::Show($tpl);
9494
}
95-
95+
9696
public function render($tpl)
9797
{
9898
Template::Show($tpl);
9999
}
100-
100+
101101
public function log($text, $file='log')
102102
{
103103
Debug::log($text, $file);
104104
}
105-
105+
106106
public function firephp()
107107
{
108108
include_once CORE_PATH.DS.'lib'.DS.'firebug'.DS.'FirePHP.class.php';
109-
109+
110110
$instance = FirePHP::getInstance(true);
111111
$args = func_get_args();
112112
return call_user_func_array(array($instance,'fb'),$args);
113113
}
114-
114+
115115
public function callHook($hook_name)
116116
{
117117
if(file_exists(SITE_ROOT.'/core/hooks/'.$hook_name))

0 commit comments

Comments
 (0)