From 38b687f420bd2cbb14737648808bb1b949c506aa Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Wed, 21 Dec 2011 11:22:08 +0000 Subject: [PATCH] Fix naming convention for class methods --- .../lib/SihnonFramework/Auth/Plugin/Database/User.class.php | 4 ++-- source/lib/SihnonFramework/DatabaseObject.class.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/lib/SihnonFramework/Auth/Plugin/Database/User.class.php b/source/lib/SihnonFramework/Auth/Plugin/Database/User.class.php index aed9115..606b89f 100644 --- a/source/lib/SihnonFramework/Auth/Plugin/Database/User.class.php +++ b/source/lib/SihnonFramework/Auth/Plugin/Database/User.class.php @@ -44,7 +44,7 @@ class SihnonFramework_Auth_Plugin_Database_User extends Sihnon_DatabaseObject im public function groups($ignore_cache = false) { if ($this->groups === null || $ignore_cache) { - $this->groups = Sihnon_Auth_Plugin_Database_Group::all_for('user', $this->id, 'groups_by_user'); + $this->groups = Sihnon_Auth_Plugin_Database_Group::allFor('user', $this->id, 'groups_by_user'); } return $this->groups; @@ -52,7 +52,7 @@ class SihnonFramework_Auth_Plugin_Database_User extends Sihnon_DatabaseObject im public function permissions($ignore_cache = false) { if ($this->permissions === null || $ignore_cache) { - $this->permissions = Sihnon_Auth_Plugin_Database_Permission::all_for('user', $this->id, 'permissions_by_user'); + $this->permissions = Sihnon_Auth_Plugin_Database_Permission::allFor('user', $this->id, 'permissions_by_user'); } return $this->permissions; diff --git a/source/lib/SihnonFramework/DatabaseObject.class.php b/source/lib/SihnonFramework/DatabaseObject.class.php index 45bcae4..3139676 100644 --- a/source/lib/SihnonFramework/DatabaseObject.class.php +++ b/source/lib/SihnonFramework/DatabaseObject.class.php @@ -79,7 +79,7 @@ abstract class SihnonFramework_DatabaseObject { return $objects; } - public static function all_for($field, $value, $view = null, $additional_conditions = null, $additional_params = null) { + public static function allFor($field, $value, $view = null, $additional_conditions = null, $additional_params = null) { $database = SihnonFramework_Main::instance()->database(); if ($view === null) { @@ -155,7 +155,7 @@ abstract class SihnonFramework_DatabaseObject { $this->id = $database->lastInsertId(); } - protected function save() { + public function save() { $database = SihnonFramework_Main::instance()->database(); $class = new ReflectionClass(get_called_class());