bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more module updates

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-20 18:21:45 +02:00
parent cde7b73a73
commit 322dd995bf
25 changed files with 747 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sites/all/modules/contrib/dev/variable/variable_realm/variable_realm.form.inc
View File

@@ -86,7 +86,13 @@ function variable_realm_edit_variables_form($form, &$form_state, $realm_name, $r
$form['realm_name'] = array('#type' => 'value', '#value' => $realm_name);
$form['realm_key'] = array('#type' => 'value', '#value' => $realm_key);
$options['realm'] = variable_realm($realm_name, $realm_key);
if ($variable_list = $controller->getEnabledVariables()) {
$form = variable_base_form($form, $form_state, $variable_list, $options);
// variable_base_form() adds its own submit handler overriding the default,
// so we need to add it as a explicit submit callback here.
$form['#submit'][] = 'variable_realm_edit_variables_form_submit';
// Group variables by variable group for vertical tabls
$group_list = array();
foreach ($variable_list as $variable_name) {

6
sites/all/modules/contrib/dev/variable/variable_realm/variable_realm.info
View File

@@ -8,9 +8,9 @@ version = 7.x-2.x
files[] = variable_realm.class.inc
files[] = variable_realm_union.class.inc
; Information added by drupal.org packaging script on 2013-08-09
version = "7.x-2.3"
; Information added by Drupal.org packaging script on 2014-04-23
version = "7.x-2.5"
core = "7.x"
project = "variable"
datestamp = "1376034993"
datestamp = "1398250128"

4
sites/all/modules/contrib/dev/variable/variable_realm/variable_realm.module
View File

@@ -29,10 +29,10 @@ function variable_realm_boot() {
* Implements hook_init()
*
* Let realms be overriden by query string parameters, but only for:
* - Admin paths (not variable admin pages)
* - Admin paths (not variable realm admin pages)
*/
function variable_realm_init() {
if (arg(0) == 'admin' && arg(3) != 'variable' && ($params = variable_realm_params()) && user_access('administer site configuration')) {
if (arg(0) == 'admin' && (arg(3) != 'variable' || arg(4) != 'realm') && ($params = variable_realm_params()) && user_access('administer site configuration')) {
foreach ($params as $realm_name => $realm_key) {
variable_realm_switch($realm_name, $realm_key, FALSE);
}