stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-26 23:49:14 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't specify the default identity provider in the gallery installer. Let the user module use that as a trigger to set ownership of the root album to the administrator.

Browse Source
This commit is contained in:
Tim Almdal
2009-10-31 14:13:35 -07:00
parent 8db2406c00
commit abe42002b2
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gallery/helpers/gallery_installer.php
View File

@@ -253,8 +253,6 @@ class gallery_installer {
$theme->save();
}
module::set_var("gallery", "identity_provider", "user");
block_manager::add("dashboard_sidebar", "gallery", "block_adder");
block_manager::add("dashboard_sidebar", "gallery", "stats");
block_manager::add("dashboard_sidebar", "gallery", "platform_info");

14
modules/user/helpers/user_installer.php
View File

@@ -70,8 +70,18 @@ class user_installer {
$admin->admin = true;
$admin->save();
// Let the admin own everything
$db->query("update {items} set owner_id = {$admin->id}");
$current_provider = module::get_var("gallery", "identity_provider");
if (empty($current_provider)) {
// If there is no provider defined then we are doing an initial install
// so we need to set the provider and make the administrator own everything
// If the installer is called and there is an identity provider, then we
// are switching identity providers and and the event handlers will do the
// right things
module::set_var("gallery", "identity_provider", "user");
// Let the admin own everything
$db->query("update {items} set owner_id = {$admin->id}");
}
$root = ORM::factory("item", 1);
access::allow($everybody, "view", $root);