summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM <m@lfurio.us>2015-11-22 03:04:06 -0500
committerM <m@lfurio.us>2015-11-22 03:04:06 -0500
commit2710f0de8d8d900a0997fd72f315c8a6f07329cf (patch)
tree2621320d77ad10b051f927d9af43f43406c6b747
parent7acf1af340b9d11b72bca70731ed6dbcd7c95132 (diff)
downloadscrott-2710f0de8d8d900a0997fd72f315c8a6f07329cf.tar.gz
scrott-2710f0de8d8d900a0997fd72f315c8a6f07329cf.zip
* Derp, default is a reserved word, calling the function 'deflt' instead
* Removed explicit call to parent constructor in model class, since that function is not explicitly defined
-rw-r--r--app/class/model.class.php2
-rw-r--r--app/controller/sysconf.control.php2
-rw-r--r--app/model/sysconf.mod.php2
3 files changed, 2 insertions, 4 deletions
diff --git a/app/class/model.class.php b/app/class/model.class.php
index 25e34ab..4f597f7 100644
--- a/app/class/model.class.php
+++ b/app/class/model.class.php
@@ -12,8 +12,6 @@ abstract class Model extends Framework
*/
function __construct()
{
- parent::__construct();
-
$this->errorlist = array();
$this->warninglist = array();
$this->noticelist = array();
diff --git a/app/controller/sysconf.control.php b/app/controller/sysconf.control.php
index b69da87..f96c97e 100644
--- a/app/controller/sysconf.control.php
+++ b/app/controller/sysconf.control.php
@@ -19,7 +19,7 @@ class Sysconf extends Controller
function action_default($mod)
{
- $mod->default();
+ $mod->deflt();
include "view/sysconf/default.view.php";
}
}
diff --git a/app/model/sysconf.mod.php b/app/model/sysconf.mod.php
index 11b8f4f..cc29294 100644
--- a/app/model/sysconf.mod.php
+++ b/app/model/sysconf.mod.php
@@ -7,7 +7,7 @@ class SysconfModel extends Model
/*
* Default action
*/
- function default()
+ function deflt()
{
}
}