Projet

Général

Profil

Révision 74f6bef0

Ajouté par Assos Assos il y a plus de 10 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/themes/adaptivetheme/at_core/inc/forms/at_core.submit.builders.inc
28 28
 * @param $sidebar_first, an arbitrary numeric value.
29 29
 * @param $sidebar_second, an arbitrary numeric value.
30 30
 * @param $sidebar_unit, one of px, em or %.
31
 * @param $theme_name, the active theme.
31 32
 *
32 33
 * @see three_col_grail_layout() for an example of a builder function with docs.
33 34
 */
34
function at_build_page_layout($method, $sidebar_first, $sidebar_second, $sidebar_unit) {
35
  global $theme_name;
35
function at_build_page_layout($method, $sidebar_first, $sidebar_second, $sidebar_unit, $theme_name = NULL) {
36
  // Use the passed in theme_name, else grab it from global $theme_key
37
  if ($theme_name == NULL) {
38
    global $theme_key;
39
    $theme_name = $theme_key;
40
  }
41

  
36 42
  $output = '';
37 43

  
38 44
  // We need to invoke at_load_plugins() to get the function names, this is
39 45
  // rather expensive but we're in a submit function so IMO this is OK.
40 46
  at_load_plugins($theme_name, $plugin_type = 'page_layout');
41 47

  
42
  $builder_functions = responsive_page_layouts_data_structure();
48
  $builder_functions = responsive_page_layouts_data_structure($theme_name);
43 49

  
44 50
  foreach ($builder_functions as $function_prefix => $redundant_values) {
45 51
    if ($method === $function_prefix) {

Formats disponibles : Unified diff