summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2016-01-31 19:39:55 -0500
committerDavid Rothstein <drothstein@gmail.com>2016-01-31 19:39:55 -0500
commitd270faa4da407450203bfa198202fea915914288 (patch)
tree73c03f09ab380e5334f2936187f2c7ab39fadee9 /modules
parentdd3004f88462db00e7bb28c908fd353b249ad99b (diff)
downloadbrdo-d270faa4da407450203bfa198202fea915914288.tar.gz
brdo-d270faa4da407450203bfa198202fea915914288.tar.bz2
Issue #2632284 by eiriksm, brianV: Fix code style issues in block.module
Diffstat (limited to 'modules')
-rw-r--r--modules/block/block.module28
1 files changed, 19 insertions, 9 deletions
diff --git a/modules/block/block.module b/modules/block/block.module
index d2dde25e9..ca41da71c 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -16,7 +16,7 @@ define('BLOCK_REGION_NONE', -1);
define('BLOCK_CUSTOM_FIXED', 0);
/**
- * Shows this block by default, but lets individual users hide it.
+ * Shows this block by default, but lets individual users hide it.
*/
define('BLOCK_CUSTOM_ENABLED', 1);
@@ -59,6 +59,7 @@ function block_help($path, $arg) {
$output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can <a href="@block-add">add custom blocks</a>, which are then listed on the <a href="@blocks">Blocks administration page</a>. Once created, custom blocks behave just like default and module-generated blocks.', array('@blocks' => url('admin/structure/block'), '@block-add' => url('admin/structure/block/add'))) . '</dd>';
$output .= '</dl>';
return $output;
+
case 'admin/structure/block/add':
return '<p>' . t('Use this page to create a new custom block.') . '</p>';
}
@@ -189,6 +190,7 @@ function _block_themes_access($theme) {
* @param $theme
* The theme whose blocks are being configured. If not set, the default theme
* is assumed.
+ *
* @return
* The theme that should be used for the block configuration page, or NULL
* to indicate that the default theme should be used.
@@ -343,7 +345,10 @@ function _block_get_renderable_array($list = array()) {
// to perform contextual actions on the help block, and the links needlessly
// draw attention on it.
if ($key != 'system_main' && $key != 'system_help') {
- $build[$key]['#contextual_links']['block'] = array('admin/structure/block/manage', array($block->module, $block->delta));
+ $build[$key]['#contextual_links']['block'] = array(
+ 'admin/structure/block/manage',
+ array($block->module, $block->delta),
+ );
}
$build[$key] += array(
@@ -646,7 +651,8 @@ function block_theme_initialize($theme) {
$regions = system_region_list($theme, REGIONS_VISIBLE);
$result = db_query("SELECT * FROM {block} WHERE theme = :theme", array(':theme' => $default_theme), array('fetch' => PDO::FETCH_ASSOC));
foreach ($result as $block) {
- // If the region isn't supported by the theme, assign the block to the theme's default region.
+ // If the region isn't supported by the theme, assign the block to the
+ // theme's default region.
if ($block['status'] && !isset($regions[$block['region']])) {
$block['region'] = system_default_region($theme);
}
@@ -814,17 +820,18 @@ function block_block_list_alter(&$blocks) {
// with different case. Ex: /Page, /page, /PAGE.
$pages = drupal_strtolower($block->pages);
if ($block->visibility < BLOCK_VISIBILITY_PHP) {
- // Convert the Drupal path to lowercase
+ // Convert the Drupal path to lowercase.
$path = drupal_strtolower(drupal_get_path_alias($_GET['q']));
// Compare the lowercase internal and lowercase path alias (if any).
$page_match = drupal_match_path($path, $pages);
if ($path != $_GET['q']) {
$page_match = $page_match || drupal_match_path($_GET['q'], $pages);
}
- // When $block->visibility has a value of 0 (BLOCK_VISIBILITY_NOTLISTED),
- // the block is displayed on all pages except those listed in $block->pages.
- // When set to 1 (BLOCK_VISIBILITY_LISTED), it is displayed only on those
- // pages listed in $block->pages.
+ // When $block->visibility has a value of 0
+ // (BLOCK_VISIBILITY_NOTLISTED), the block is displayed on all pages
+ // except those listed in $block->pages. When set to 1
+ // (BLOCK_VISIBILITY_LISTED), it is displayed only on those pages
+ // listed in $block->pages.
$page_match = !($block->visibility xor $page_match);
}
elseif (module_exists('php')) {
@@ -847,7 +854,8 @@ function block_block_list_alter(&$blocks) {
* Render the content and subject for a set of blocks.
*
* @param $region_blocks
- * An array of block objects such as returned for one region by _block_load_blocks().
+ * An array of block objects such as returned for one region by
+ * _block_load_blocks().
*
* @return
* An array of visible blocks as expected by drupal_render().
@@ -955,6 +963,8 @@ function _block_render_blocks($region_blocks) {
* Theme and language contexts are automatically differentiated.
*
* @param $block
+ * The block to get the cache_id from.
+ *
* @return
* The string used as cache_id for the block.
*/