5 files changed, 23 insertions, 20 deletions

diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index 95d46597..d2c03948 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -82,7 +82,7 @@ class core_installer {
                    UNIQUE KEY(`name`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-      $db->query("CREATE TABLE `parameters` (
+      $db->query("CREATE TABLE `vars` (
                    `id` int(9) NOT NULL auto_increment,
                    `module_id` int(9),
                    `name` char(255) NOT NULL,
@@ -124,7 +124,10 @@ class core_installer {
     $db->query("DROP TABLE IF EXISTS `permissions`;");
     $db->query("DROP TABLE IF EXISTS `items`;");
     $db->query("DROP TABLE IF EXISTS `modules`;");
+    // @todo remove before release
     $db->query("DROP TABLE IF EXISTS `parameters`;");
+    // @todo-end
+    $db->query("DROP TABLE IF EXISTS `vars`;");
     system("/bin/rm -rf " . VARPATH . "albums");
     system("/bin/rm -rf " . VARPATH . "resizes");
   }
diff --git a/core/helpers/module.php b/core/helpers/module.php
index cc1823b4..b09f121d 100644
--- a/core/helpers/module.php
+++ b/core/helpers/module.php
@@ -89,27 +89,27 @@ class module_Core {
     }
   }
 
-  public function get_parameter($module_name, $name, $default_value=null) {
+  public function get_var($module_name, $name, $default_value=null) {
     $module = ORM::factory("module")->where("name", $module_name)->find();
-    $parameter = ORM::factory("parameter")
+    $var = ORM::factory("var")
       ->where("module_id", $module->id)
       ->where("name", $name)
       ->find();
-    return $parameter->loaded ? $parameter->value : $default_value;
+    return $var->loaded ? $var->value : $default_value;
   }
 
-  public function set_parameter($module_name, $name, $value) {
+  public function set_var($module_name, $name, $value) {
     $module = ORM::factory("module")->where("name", $module_name)->find();
-    $parameter = ORM::factory("parameter")
+    $var = ORM::factory("var")
       ->where("module_id", $module->id)
       ->where("name", $name)
       ->find();
-    if (!$parameter->loaded) {
-      $parameter = ORM::factory("parameter");
-      $parameter->module_id = $module->id;
-      $parameter->name = $name;
+    if (!$var->loaded) {
+      $var = ORM::factory("var");
+      $var->module_id = $module->id;
+      $var->name = $name;
     }
-    $parameter->value = $value;
-    $parameter->save();
+    $var->value = $value;
+    $var->save();
   }
 }
diff --git a/core/models/module.php b/core/models/module.php
index 5229f42d..da9fb0a1 100644
--- a/core/models/module.php
+++ b/core/models/module.php
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Module_Model extends ORM {
-  protected $has_many = array("parameters");
+  protected $has_many = array("vars");
 }
diff --git a/core/models/parameter.php b/core/models/var.php
index 9817ff2f..d5aa1849 100644
--- a/core/models/parameter.php
+++ b/core/models/var.php
@@ -17,6 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Parameter_Model extends ORM {
+class Var_Model extends ORM {
   protected $belongs_to = array("module");
 }
diff --git a/core/tests/Parameters_Test.php b/core/tests/Var_Test.php
index 7f6d33d1..05945089 100644
--- a/core/tests/Parameters_Test.php
+++ b/core/tests/Var_Test.php
@@ -17,15 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Parameters_Test extends Unit_Test_Case {
+class Var_Test extends Unit_Test_Case {
   public function add_parameter_test() {
-    module::set_parameter("core", "Parameter", "original value");
-    $this->assert_equal("original value", module::get_parameter("core", "Parameter"));
+    module::set_var("core", "Parameter", "original value");
+    $this->assert_equal("original value", module::get_var("core", "Parameter"));
 
-    module::set_parameter("core", "Parameter", "updated value");
-    $this->assert_equal("updated value", module::get_parameter("core", "Parameter"));
+    module::set_var("core", "Parameter", "updated value");
+    $this->assert_equal("updated value", module::get_var("core", "Parameter"));
 
-    module::set_parameter("core", "Parameter2", "new parameter");
+    module::set_var("core", "Parameter2", "new parameter");
     $core = module::get("core");
 
     $expected = array("Parameter" => "updated value", "Parameter2" => "new parameter");