Skip to content
Snippets Groups Projects
Commit 56e79901 authored by Tim Steiner's avatar Tim Steiner
Browse files

Merging trunk into testing.

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/testing@272 20a16fea-79d4-4915-8869-1ea9d5ebf173
parents 49565d9b b421894c
No related branches found
No related tags found
No related merge requests found
......@@ -261,8 +261,21 @@ EOF;
module_enable(array('unl_cas'));
// Copy the authenticated user role's permissions for text formats from the default site.
db_query("REPLACE INTO {$new_prefix}role_permission (rid, permission, module) SELECT rid, permission, module FROM {$shared_prefix}role_permission WHERE rid=:rid AND module='filter'", array(':rid' => DRUPAL_AUTHENTICATED_RID));
// Copy the anonymous/authenticated user roles' permissions for text formats from the default site.
db_query(
"REPLACE INTO {$new_prefix}role_permission (rid, permission, module) "
. "SELECT rid, permission, module "
. "FROM {$shared_prefix}role_permission "
. "WHERE rid IN(:rid) AND module='filter' ",
array(':rid' => array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))
);
db_query(
"REPLACE INTO {$new_prefix}variable (name, value) "
. "SELECT name, value "
. "FROM {$shared_prefix}variable "
. "WHERE name='filter_fallback_format' "
);
// Create the Site Admin role
$site_admin_role = new stdClass();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment