Projet

Général

Profil

Révision 6ff32cea

Ajouté par Florent Torregrosa il y a environ 9 ans

Update core to 7.36

Voir les différences:

drupal7/modules/block/block.module
66 66
    $demo_theme = !empty($arg[4]) ? $arg[4] : variable_get('theme_default', 'bartik');
67 67
    $themes = list_themes();
68 68
    $output = '<p>' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the <em>Save blocks</em> button at the bottom of the page. Click the <em>configure</em> link next to each block to configure its specific title and visibility settings.') . '</p>';
69
    $output .= '<p>' . l(t('Demonstrate block regions (@theme)', array('@theme' => $themes[$demo_theme]->info['name'])), 'admin/structure/block/demo/' . $demo_theme) . '</p>';
69
    $output .= '<p>' . l(t('Demonstrate block regions (!theme)', array('!theme' => $themes[$demo_theme]->info['name'])), 'admin/structure/block/demo/' . $demo_theme) . '</p>';
70 70
    return $output;
71 71
  }
72 72
}
......
143 143
  );
144 144
  foreach (list_themes() as $key => $theme) {
145 145
    $items['admin/structure/block/list/' . $key] = array(
146
      'title' => check_plain($theme->info['name']),
146
      'title' => $theme->info['name'],
147 147
      'page arguments' => array($key),
148 148
      'type' => $key == $default_theme ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
149 149
      'weight' => $key == $default_theme ? -10 : 0,
......
162 162
      );
163 163
    }
164 164
    $items['admin/structure/block/demo/' . $key] = array(
165
      'title' => check_plain($theme->info['name']),
165
      'title' => $theme->info['name'],
166 166
      'page callback' => 'block_admin_demo',
167 167
      'page arguments' => array($key),
168 168
      'type' => MENU_CALLBACK,
......
692 692
/**
693 693
 * Loads a block object from the database.
694 694
 *
695
 * This function returns the first block matching the module and delta
696
 * parameters, so it should not be used for theme-specific functionality.
697
 *
695 698
 * @param $module
696 699
 *   Name of the module that implements the block to load.
697 700
 * @param $delta

Formats disponibles : Unified diff