@@ -4,38 +4,38 @@ |
||
| 4 | 4 | * Implementation of hook_context_default_contexts(). |
| 5 | 5 | */ |
| 6 | 6 | function spam_controls_context_default_contexts() { |
| 7 | - $export = array(); |
|
| 7 | + $export = array(); |
|
| 8 | 8 | |
| 9 | - $context = new stdClass; |
|
| 10 | - $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */ |
|
| 11 | - $context->api_version = 3; |
|
| 12 | - $context->name = 'account_info'; |
|
| 13 | - $context->description = ''; |
|
| 14 | - $context->tag = 'account'; |
|
| 15 | - $context->conditions = array( |
|
| 9 | + $context = new stdClass; |
|
| 10 | + $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */ |
|
| 11 | + $context->api_version = 3; |
|
| 12 | + $context->name = 'account_info'; |
|
| 13 | + $context->description = ''; |
|
| 14 | + $context->tag = 'account'; |
|
| 15 | + $context->conditions = array( |
|
| 16 | 16 | 'path' => array( |
| 17 | - 'values' => array( |
|
| 17 | + 'values' => array( |
|
| 18 | 18 | 'account/info/edit/profile' => 'account/info/edit/profile', |
| 19 | - ), |
|
| 19 | + ), |
|
| 20 | 20 | ), |
| 21 | 21 | 'user_page' => array( |
| 22 | - 'values' => array( |
|
| 22 | + 'values' => array( |
|
| 23 | 23 | 'form' => 'form', |
| 24 | - ), |
|
| 25 | - 'options' => array( |
|
| 24 | + ), |
|
| 25 | + 'options' => array( |
|
| 26 | 26 | 'mode' => 'current', |
| 27 | - ), |
|
| 27 | + ), |
|
| 28 | 28 | ), |
| 29 | - ); |
|
| 30 | - $context->reactions = array( |
|
| 29 | + ); |
|
| 30 | + $context->reactions = array( |
|
| 31 | 31 | 'menu' => 'user/me/edit', |
| 32 | - ); |
|
| 33 | - $context->condition_mode = 0; |
|
| 32 | + ); |
|
| 33 | + $context->condition_mode = 0; |
|
| 34 | 34 | |
| 35 | - // Translatables |
|
| 36 | - // Included for use with string extractors like potx. |
|
| 37 | - t('account'); |
|
| 38 | - $export['account_info'] = $context; |
|
| 35 | + // Translatables |
|
| 36 | + // Included for use with string extractors like potx. |
|
| 37 | + t('account'); |
|
| 38 | + $export['account_info'] = $context; |
|
| 39 | 39 | |
| 40 | - return $export; |
|
| 40 | + return $export; |
|
| 41 | 41 | } |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | $export = array(); |
| 8 | 8 | |
| 9 | 9 | $context = new stdClass; |
| 10 | - $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */ |
|
| 10 | + $context->disabled = false; /* Edit this to true to make a default context disabled initially */ |
|
| 11 | 11 | $context->api_version = 3; |
| 12 | 12 | $context->name = 'account_info'; |
| 13 | 13 | $context->description = ''; |
@@ -4,11 +4,11 @@ |
||
| 4 | 4 | * Implementation of hook_ctools_plugin_api(). |
| 5 | 5 | */ |
| 6 | 6 | function spam_controls_ctools_plugin_api() { |
| 7 | - list($module, $api) = func_get_args(); |
|
| 8 | - if ($module == "context" && $api == "context") { |
|
| 7 | + list($module, $api) = func_get_args(); |
|
| 8 | + if ($module == "context" && $api == "context") { |
|
| 9 | 9 | return array("version" => 3); |
| 10 | - } |
|
| 11 | - elseif ($module == "strongarm" && $api == "strongarm") { |
|
| 10 | + } |
|
| 11 | + elseif ($module == "strongarm" && $api == "strongarm") { |
|
| 12 | 12 | return array("version" => 1); |
| 13 | - } |
|
| 13 | + } |
|
| 14 | 14 | } |
@@ -7,8 +7,7 @@ |
||
| 7 | 7 | list($module, $api) = func_get_args(); |
| 8 | 8 | if ($module == "context" && $api == "context") { |
| 9 | 9 | return array("version" => 3); |
| 10 | - } |
|
| 11 | - elseif ($module == "strongarm" && $api == "strongarm") { |
|
| 10 | + } elseif ($module == "strongarm" && $api == "strongarm") { |
|
| 12 | 11 | return array("version" => 1); |
| 13 | 12 | } |
| 14 | 13 | } |
@@ -4,37 +4,37 @@ |
||
| 4 | 4 | * Implementation of hook_user_default_permissions(). |
| 5 | 5 | */ |
| 6 | 6 | function spam_controls_user_default_permissions() { |
| 7 | - $permissions = array(); |
|
| 7 | + $permissions = array(); |
|
| 8 | 8 | |
| 9 | - // Exported permission: administer CAPTCHA settings |
|
| 10 | - $permissions['administer CAPTCHA settings'] = array( |
|
| 9 | + // Exported permission: administer CAPTCHA settings |
|
| 10 | + $permissions['administer CAPTCHA settings'] = array( |
|
| 11 | 11 | 'name' => 'administer CAPTCHA settings', |
| 12 | 12 | 'roles' => array( |
| 13 | - '0' => 'administrator', |
|
| 13 | + '0' => 'administrator', |
|
| 14 | 14 | ), |
| 15 | - ); |
|
| 15 | + ); |
|
| 16 | 16 | |
| 17 | - // Exported permission: administer recaptcha |
|
| 18 | - $permissions['administer recaptcha'] = array( |
|
| 17 | + // Exported permission: administer recaptcha |
|
| 18 | + $permissions['administer recaptcha'] = array( |
|
| 19 | 19 | 'name' => 'administer recaptcha', |
| 20 | 20 | 'roles' => array( |
| 21 | - '0' => 'administrator', |
|
| 21 | + '0' => 'administrator', |
|
| 22 | 22 | ), |
| 23 | - ); |
|
| 23 | + ); |
|
| 24 | 24 | |
| 25 | - // Exported permission: administer spamicide |
|
| 26 | - $permissions['administer spamicide'] = array( |
|
| 25 | + // Exported permission: administer spamicide |
|
| 26 | + $permissions['administer spamicide'] = array( |
|
| 27 | 27 | 'name' => 'administer spamicide', |
| 28 | 28 | 'roles' => array( |
| 29 | - '0' => 'administrator', |
|
| 29 | + '0' => 'administrator', |
|
| 30 | 30 | ), |
| 31 | - ); |
|
| 31 | + ); |
|
| 32 | 32 | |
| 33 | - // Exported permission: skip CAPTCHA |
|
| 34 | - $permissions['skip CAPTCHA'] = array( |
|
| 33 | + // Exported permission: skip CAPTCHA |
|
| 34 | + $permissions['skip CAPTCHA'] = array( |
|
| 35 | 35 | 'name' => 'skip CAPTCHA', |
| 36 | 36 | 'roles' => array(), |
| 37 | - ); |
|
| 37 | + ); |
|
| 38 | 38 | |
| 39 | - return $permissions; |
|
| 39 | + return $permissions; |
|
| 40 | 40 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Implements hook_panels_layouts(). |
| 4 | 4 | */ |
| 5 | 5 | function zen_one_sidebar_second_panels_layouts() { |
| 6 | - $items['one_sidebar_second'] = array( |
|
| 6 | + $items['one_sidebar_second'] = array( |
|
| 7 | 7 | 'title' => t('Zen Layout: one sidebar after content'), |
| 8 | 8 | 'icon' => 'one-sidebar-second.png', |
| 9 | 9 | 'theme' => 'zen_one_sidebar_second', |
@@ -11,10 +11,10 @@ discard block |
||
| 11 | 11 | 'css' => 'one-sidebar-second.css', |
| 12 | 12 | 'admin css' => 'one-sidebar-second-admin.css', |
| 13 | 13 | 'panels' => array( |
| 14 | - 'content' => t('Content'), |
|
| 15 | - 'sidebar_first' => t('First sidebar'), |
|
| 14 | + 'content' => t('Content'), |
|
| 15 | + 'sidebar_first' => t('First sidebar'), |
|
| 16 | 16 | ), |
| 17 | - ); |
|
| 17 | + ); |
|
| 18 | 18 | |
| 19 | - return $items; |
|
| 19 | + return $items; |
|
| 20 | 20 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Implements hook_panels_layouts(). |
| 4 | 4 | */ |
| 5 | 5 | function zen_two_sidebars_panels_layouts() { |
| 6 | - $items['two_sidebars'] = array( |
|
| 6 | + $items['two_sidebars'] = array( |
|
| 7 | 7 | 'title' => t('Zen Layout: two sidebars with content'), |
| 8 | 8 | 'icon' => 'two-sidebars.png', |
| 9 | 9 | 'theme' => 'zen_two_sidebars', |
@@ -11,11 +11,11 @@ discard block |
||
| 11 | 11 | 'css' => 'two-sidebars.css', |
| 12 | 12 | 'admin css' => 'two-sidebars-admin.css', |
| 13 | 13 | 'panels' => array( |
| 14 | - 'content' => t('Content'), |
|
| 15 | - 'sidebar_first' => t('First sidebar'), |
|
| 16 | - 'sidebar_second' => t('Second sidebar'), |
|
| 14 | + 'content' => t('Content'), |
|
| 15 | + 'sidebar_first' => t('First sidebar'), |
|
| 16 | + 'sidebar_second' => t('Second sidebar'), |
|
| 17 | 17 | ), |
| 18 | - ); |
|
| 18 | + ); |
|
| 19 | 19 | |
| 20 | - return $items; |
|
| 20 | + return $items; |
|
| 21 | 21 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Implements hook_panels_layouts(). |
| 4 | 4 | */ |
| 5 | 5 | function zen_two_sidebars_second_panels_layouts() { |
| 6 | - $items['two_sidebars_second'] = array( |
|
| 6 | + $items['two_sidebars_second'] = array( |
|
| 7 | 7 | 'title' => t('Zen Layout: two sidebars after content'), |
| 8 | 8 | 'icon' => 'two-sidebars-second.png', |
| 9 | 9 | 'theme' => 'zen_two_sidebars_second', |
@@ -11,11 +11,11 @@ discard block |
||
| 11 | 11 | 'css' => 'two-sidebars-second.css', |
| 12 | 12 | 'admin css' => 'two-sidebars-second-admin.css', |
| 13 | 13 | 'panels' => array( |
| 14 | - 'content' => t('Content'), |
|
| 15 | - 'sidebar_first' => t('First sidebar'), |
|
| 16 | - 'sidebar_second' => t('Second sidebar'), |
|
| 14 | + 'content' => t('Content'), |
|
| 15 | + 'sidebar_first' => t('First sidebar'), |
|
| 16 | + 'sidebar_second' => t('Second sidebar'), |
|
| 17 | 17 | ), |
| 18 | - ); |
|
| 18 | + ); |
|
| 19 | 19 | |
| 20 | - return $items; |
|
| 20 | + return $items; |
|
| 21 | 21 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Implements hook_panels_layouts(). |
| 4 | 4 | */ |
| 5 | 5 | function zen_one_sidebar_first_panels_layouts() { |
| 6 | - $items['one_sidebar_first'] = array( |
|
| 6 | + $items['one_sidebar_first'] = array( |
|
| 7 | 7 | 'title' => t('Zen Layout: one sidebar before content'), |
| 8 | 8 | 'icon' => 'one-sidebar-first.png', |
| 9 | 9 | 'theme' => 'zen_one_sidebar_first', |
@@ -11,10 +11,10 @@ discard block |
||
| 11 | 11 | 'css' => 'one-sidebar-first.css', |
| 12 | 12 | 'admin css' => 'one-sidebar-first-admin.css', |
| 13 | 13 | 'panels' => array( |
| 14 | - 'content' => t('Content'), |
|
| 15 | - 'sidebar_first' => t('First sidebar'), |
|
| 14 | + 'content' => t('Content'), |
|
| 15 | + 'sidebar_first' => t('First sidebar'), |
|
| 16 | 16 | ), |
| 17 | - ); |
|
| 17 | + ); |
|
| 18 | 18 | |
| 19 | - return $items; |
|
| 19 | + return $items; |
|
| 20 | 20 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Implements hook_panels_layouts(). |
| 4 | 4 | */ |
| 5 | 5 | function zen_two_sidebars_first_panels_layouts() { |
| 6 | - $items['two_sidebars_first'] = array( |
|
| 6 | + $items['two_sidebars_first'] = array( |
|
| 7 | 7 | 'title' => t('Zen Layout: two sidebars before content'), |
| 8 | 8 | 'icon' => 'two-sidebars-first.png', |
| 9 | 9 | 'theme' => 'zen_two_sidebars_first', |
@@ -11,11 +11,11 @@ discard block |
||
| 11 | 11 | 'css' => 'two-sidebars-first.css', |
| 12 | 12 | 'admin css' => 'two-sidebars-first-admin.css', |
| 13 | 13 | 'panels' => array( |
| 14 | - 'content' => t('Content'), |
|
| 15 | - 'sidebar_first' => t('First sidebar'), |
|
| 16 | - 'sidebar_second' => t('Second sidebar'), |
|
| 14 | + 'content' => t('Content'), |
|
| 15 | + 'sidebar_first' => t('First sidebar'), |
|
| 16 | + 'sidebar_second' => t('Second sidebar'), |
|
| 17 | 17 | ), |
| 18 | - ); |
|
| 18 | + ); |
|
| 19 | 19 | |
| 20 | - return $items; |
|
| 20 | + return $items; |
|
| 21 | 21 | } |
@@ -21,92 +21,92 @@ |
||
| 21 | 21 | * An array of all the theme paths. |
| 22 | 22 | */ |
| 23 | 23 | function conditional_styles_paths_to_basetheme($theme) { |
| 24 | - static $theme_paths; |
|
| 25 | - if (empty($theme_paths[$theme])) { |
|
| 24 | + static $theme_paths; |
|
| 25 | + if (empty($theme_paths[$theme])) { |
|
| 26 | 26 | $theme_paths[$theme] = array(); |
| 27 | 27 | $themes = list_themes(); |
| 28 | 28 | // Grab the paths from the base theme. |
| 29 | 29 | if (!empty($themes[$theme]->base_theme)) { |
| 30 | - $theme_paths[$theme] = conditional_styles_paths_to_basetheme($themes[$theme]->base_theme); |
|
| 30 | + $theme_paths[$theme] = conditional_styles_paths_to_basetheme($themes[$theme]->base_theme); |
|
| 31 | 31 | } |
| 32 | 32 | $theme_paths[$theme][$theme] = dirname($themes[$theme]->filename); |
| 33 | - } |
|
| 34 | - return $theme_paths[$theme]; |
|
| 33 | + } |
|
| 34 | + return $theme_paths[$theme]; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * When the theme registry is rebuilt, we also build the conditional stylesheets. |
| 39 | 39 | */ |
| 40 | 40 | function _conditional_styles_theme($existing, $type, $theme, $path) { |
| 41 | - // Process the conditional stylesheets for every active theme. |
|
| 42 | - $themes = list_themes(); |
|
| 43 | - foreach (array_keys($themes) AS $theme) { |
|
| 41 | + // Process the conditional stylesheets for every active theme. |
|
| 42 | + $themes = list_themes(); |
|
| 43 | + foreach (array_keys($themes) AS $theme) { |
|
| 44 | 44 | // We only need to process active themes. |
| 45 | 45 | if ($themes[$theme]->status || $GLOBALS['theme'] == $theme) { |
| 46 | - $paths = conditional_styles_paths_to_basetheme($theme); |
|
| 46 | + $paths = conditional_styles_paths_to_basetheme($theme); |
|
| 47 | 47 | |
| 48 | - // Grab all the conditional stylesheets. |
|
| 49 | - $stylesheets = array(); |
|
| 50 | - // Start with the base theme and travel up the chain to the active theme. |
|
| 51 | - foreach ($paths AS $theme_name => $path) { |
|
| 48 | + // Grab all the conditional stylesheets. |
|
| 49 | + $stylesheets = array(); |
|
| 50 | + // Start with the base theme and travel up the chain to the active theme. |
|
| 51 | + foreach ($paths AS $theme_name => $path) { |
|
| 52 | 52 | // Look at the conditional-stylesheets defined in the theme's .info file. |
| 53 | 53 | if (!empty($themes[$theme_name]->info['conditional-stylesheets'])) { |
| 54 | - foreach ($themes[$theme_name]->info['conditional-stylesheets'] AS $condition => $css) { |
|
| 54 | + foreach ($themes[$theme_name]->info['conditional-stylesheets'] AS $condition => $css) { |
|
| 55 | 55 | // Allow the theme to override its base themes' styles. |
| 56 | 56 | foreach ($css AS $media => $files) { |
| 57 | - foreach ($files AS $file) { |
|
| 57 | + foreach ($files AS $file) { |
|
| 58 | 58 | $stylesheets[$condition][$media][$file] = $path; |
| 59 | - } |
|
| 59 | + } |
|
| 60 | + } |
|
| 60 | 61 | } |
| 61 | - } |
|
| 62 | 62 | } |
| 63 | - } |
|
| 64 | - // Render the stylesheets to link elements. |
|
| 65 | - $conditional_styles = $conditional_styles_rtl = ''; |
|
| 66 | - if (!empty($stylesheets)) { |
|
| 63 | + } |
|
| 64 | + // Render the stylesheets to link elements. |
|
| 65 | + $conditional_styles = $conditional_styles_rtl = ''; |
|
| 66 | + if (!empty($stylesheets)) { |
|
| 67 | 67 | $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1); |
| 68 | 68 | $base_path = base_path(); |
| 69 | 69 | foreach ($stylesheets AS $condition => $css) { |
| 70 | - // Each condition requires its own set of links. |
|
| 71 | - $output = $output_rtl = ''; |
|
| 72 | - foreach ($css AS $media => $files) { |
|
| 70 | + // Each condition requires its own set of links. |
|
| 71 | + $output = $output_rtl = ''; |
|
| 72 | + foreach ($css AS $media => $files) { |
|
| 73 | 73 | foreach ($files AS $file => $path) { |
| 74 | - // Don't allow non-existent stylesheets to clutter the logs with 404. |
|
| 75 | - if (file_exists("./$path/$file")) { |
|
| 74 | + // Don't allow non-existent stylesheets to clutter the logs with 404. |
|
| 75 | + if (file_exists("./$path/$file")) { |
|
| 76 | 76 | $link = "<link type=\"text/css\" rel=\"stylesheet\" media=\"$media\" href=\"$base_path$path/$file$query_string\" />\n"; |
| 77 | 77 | $output .= $link; |
| 78 | 78 | $output_rtl .= $link; |
| 79 | 79 | $file_rtl = str_replace('.css', '-rtl.css', $file); |
| 80 | 80 | if (file_exists("./$path/$file_rtl")) { |
| 81 | - $output_rtl .= "<link type=\"text/css\" rel=\"stylesheet\" media=\"$media\" href=\"$base_path$path/$file_rtl$query_string\" />\n"; |
|
| 81 | + $output_rtl .= "<link type=\"text/css\" rel=\"stylesheet\" media=\"$media\" href=\"$base_path$path/$file_rtl$query_string\" />\n"; |
|
| 82 | + } |
|
| 82 | 83 | } |
| 83 | - } |
|
| 84 | 84 | } |
| 85 | - } |
|
| 86 | - if ($output) { |
|
| 85 | + } |
|
| 86 | + if ($output) { |
|
| 87 | 87 | $conditional_styles .= "<!--[$condition]>\n$output<![endif]-->\n"; |
| 88 | 88 | $conditional_styles_rtl .= "<!--[$condition]>\n$output_rtl<![endif]-->\n"; |
| 89 | - } |
|
| 89 | + } |
|
| 90 | + } |
|
| 90 | 91 | } |
| 91 | - } |
|
| 92 | - // Save the stylesheets for later retrieval. |
|
| 93 | - if ($conditional_styles) { |
|
| 92 | + // Save the stylesheets for later retrieval. |
|
| 93 | + if ($conditional_styles) { |
|
| 94 | 94 | if (db_is_active()) { |
| 95 | - variable_set('conditional_styles_' . $theme, $conditional_styles); |
|
| 96 | - variable_set('conditional_styles_' . $theme . '_rtl', $conditional_styles_rtl); |
|
| 95 | + variable_set('conditional_styles_' . $theme, $conditional_styles); |
|
| 96 | + variable_set('conditional_styles_' . $theme . '_rtl', $conditional_styles_rtl); |
|
| 97 | 97 | } |
| 98 | 98 | else { |
| 99 | - $GLOBALS['conf']['conditional_styles_' . $theme] = $conditional_styles; |
|
| 100 | - $GLOBALS['conf']['conditional_styles_' . $theme . '_rtl'] = $conditional_styles_rtl; |
|
| 99 | + $GLOBALS['conf']['conditional_styles_' . $theme] = $conditional_styles; |
|
| 100 | + $GLOBALS['conf']['conditional_styles_' . $theme . '_rtl'] = $conditional_styles_rtl; |
|
| 101 | 101 | } |
| 102 | - } |
|
| 103 | - elseif (db_is_active()) { |
|
| 102 | + } |
|
| 103 | + elseif (db_is_active()) { |
|
| 104 | 104 | variable_del('conditional_styles_' . $theme); |
| 105 | 105 | variable_del('conditional_styles_' . $theme . '_rtl'); |
| 106 | - } |
|
| 106 | + } |
|
| 107 | + } |
|
| 107 | 108 | } |
| 108 | - } |
|
| 109 | 109 | |
| 110 | - // Return nothing. |
|
| 111 | - return array(); |
|
| 110 | + // Return nothing. |
|
| 111 | + return array(); |
|
| 112 | 112 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | // Render the stylesheets to link elements. |
| 65 | 65 | $conditional_styles = $conditional_styles_rtl = ''; |
| 66 | 66 | if (!empty($stylesheets)) { |
| 67 | - $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1); |
|
| 67 | + $query_string = '?'.substr(variable_get('css_js_query_string', '0'), 0, 1); |
|
| 68 | 68 | $base_path = base_path(); |
| 69 | 69 | foreach ($stylesheets AS $condition => $css) { |
| 70 | 70 | // Each condition requires its own set of links. |
@@ -92,17 +92,17 @@ discard block |
||
| 92 | 92 | // Save the stylesheets for later retrieval. |
| 93 | 93 | if ($conditional_styles) { |
| 94 | 94 | if (db_is_active()) { |
| 95 | - variable_set('conditional_styles_' . $theme, $conditional_styles); |
|
| 96 | - variable_set('conditional_styles_' . $theme . '_rtl', $conditional_styles_rtl); |
|
| 95 | + variable_set('conditional_styles_'.$theme, $conditional_styles); |
|
| 96 | + variable_set('conditional_styles_'.$theme.'_rtl', $conditional_styles_rtl); |
|
| 97 | 97 | } |
| 98 | 98 | else { |
| 99 | - $GLOBALS['conf']['conditional_styles_' . $theme] = $conditional_styles; |
|
| 100 | - $GLOBALS['conf']['conditional_styles_' . $theme . '_rtl'] = $conditional_styles_rtl; |
|
| 99 | + $GLOBALS['conf']['conditional_styles_'.$theme] = $conditional_styles; |
|
| 100 | + $GLOBALS['conf']['conditional_styles_'.$theme.'_rtl'] = $conditional_styles_rtl; |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | elseif (db_is_active()) { |
| 104 | - variable_del('conditional_styles_' . $theme); |
|
| 105 | - variable_del('conditional_styles_' . $theme . '_rtl'); |
|
| 104 | + variable_del('conditional_styles_'.$theme); |
|
| 105 | + variable_del('conditional_styles_'.$theme.'_rtl'); |
|
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | } |
@@ -94,13 +94,11 @@ |
||
| 94 | 94 | if (db_is_active()) { |
| 95 | 95 | variable_set('conditional_styles_' . $theme, $conditional_styles); |
| 96 | 96 | variable_set('conditional_styles_' . $theme . '_rtl', $conditional_styles_rtl); |
| 97 | - } |
|
| 98 | - else { |
|
| 97 | + } else { |
|
| 99 | 98 | $GLOBALS['conf']['conditional_styles_' . $theme] = $conditional_styles; |
| 100 | 99 | $GLOBALS['conf']['conditional_styles_' . $theme . '_rtl'] = $conditional_styles_rtl; |
| 101 | 100 | } |
| 102 | - } |
|
| 103 | - elseif (db_is_active()) { |
|
| 101 | + } elseif (db_is_active()) { |
|
| 104 | 102 | variable_del('conditional_styles_' . $theme); |
| 105 | 103 | variable_del('conditional_styles_' . $theme . '_rtl'); |
| 106 | 104 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | function _conditional_styles_theme($existing, $type, $theme, $path) { |
| 41 | 41 | // Process the conditional stylesheets for every active theme. |
| 42 | 42 | $themes = list_themes(); |
| 43 | - foreach (array_keys($themes) AS $theme) { |
|
| 43 | + foreach (array_keys($themes) as $theme) { |
|
| 44 | 44 | // We only need to process active themes. |
| 45 | 45 | if ($themes[$theme]->status || $GLOBALS['theme'] == $theme) { |
| 46 | 46 | $paths = conditional_styles_paths_to_basetheme($theme); |
@@ -48,13 +48,13 @@ discard block |
||
| 48 | 48 | // Grab all the conditional stylesheets. |
| 49 | 49 | $stylesheets = array(); |
| 50 | 50 | // Start with the base theme and travel up the chain to the active theme. |
| 51 | - foreach ($paths AS $theme_name => $path) { |
|
| 51 | + foreach ($paths as $theme_name => $path) { |
|
| 52 | 52 | // Look at the conditional-stylesheets defined in the theme's .info file. |
| 53 | 53 | if (!empty($themes[$theme_name]->info['conditional-stylesheets'])) { |
| 54 | - foreach ($themes[$theme_name]->info['conditional-stylesheets'] AS $condition => $css) { |
|
| 54 | + foreach ($themes[$theme_name]->info['conditional-stylesheets'] as $condition => $css) { |
|
| 55 | 55 | // Allow the theme to override its base themes' styles. |
| 56 | - foreach ($css AS $media => $files) { |
|
| 57 | - foreach ($files AS $file) { |
|
| 56 | + foreach ($css as $media => $files) { |
|
| 57 | + foreach ($files as $file) { |
|
| 58 | 58 | $stylesheets[$condition][$media][$file] = $path; |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -66,11 +66,11 @@ discard block |
||
| 66 | 66 | if (!empty($stylesheets)) { |
| 67 | 67 | $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1); |
| 68 | 68 | $base_path = base_path(); |
| 69 | - foreach ($stylesheets AS $condition => $css) { |
|
| 69 | + foreach ($stylesheets as $condition => $css) { |
|
| 70 | 70 | // Each condition requires its own set of links. |
| 71 | 71 | $output = $output_rtl = ''; |
| 72 | - foreach ($css AS $media => $files) { |
|
| 73 | - foreach ($files AS $file => $path) { |
|
| 72 | + foreach ($css as $media => $files) { |
|
| 73 | + foreach ($files as $file => $path) { |
|
| 74 | 74 | // Don't allow non-existent stylesheets to clutter the logs with 404. |
| 75 | 75 | if (file_exists("./$path/$file")) { |
| 76 | 76 | $link = "<link type=\"text/css\" rel=\"stylesheet\" media=\"$media\" href=\"$base_path$path/$file$query_string\" />\n"; |