summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/gallery/tests/No_Direct_ORM_Access_Test.php (renamed from modules/gallery/tests/No_Direct_Access_Test.php)0
-rw-r--r--modules/user/helpers/user.php4
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/tests/No_Direct_Access_Test.php b/modules/gallery/tests/No_Direct_ORM_Access_Test.php
index c6d8df95..c6d8df95 100644
--- a/modules/gallery/tests/No_Direct_Access_Test.php
+++ b/modules/gallery/tests/No_Direct_ORM_Access_Test.php
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index ec4f56ae..5f154313 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -27,7 +27,7 @@ class user_Core {
/**
* Initialize the provider so it is ready to use
*/
- public function activate() {
+ static function activate() {
$db = Database::instance();
$db->query("CREATE TABLE IF NOT EXISTS {users} (
`id` int(9) NOT NULL auto_increment,
@@ -93,7 +93,7 @@ class user_Core {
/**
* Cleanup up this provider so it is unavailable for use and won't conflict with the current driver
*/
- public function deactivate() {
+ static function deactivate() {
// Delete all users and groups so that we give other modules an opportunity to clean up
foreach (ORM::factory("user")->find_all() as $user) {
$user->delete();