Project

General

Profile

Revision bf6fb0ee

Added by Assos Assos almost 6 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/ds/ds.module
957 957
          return drupal_render($renderable_block);
958 958
          break;
959 959
        case DS_BLOCK_TITLE_CONTENT:
960
          if (isset($block->subject) && isset($block->content['#markup'])) {
961
            return '<h2 class="block-title">' . $block->subject . '</h2>' . $block->content['#markup'];
960
          if (isset($block->subject) && isset($block->content) && $block->content) {
961
            return '<h2 class="block-title">' . $block->subject . '</h2>' . drupal_render($block->content);
962 962
          }
963 963
          break;
964 964
        case DS_BLOCK_CONTENT:
965
          if (isset($block->content['#markup'])) {
966
            return $block->content['#markup'];
965
          if (isset($block->content) && $block->content) {
966
            return drupal_render($block->content);
967 967
          }
968 968
          break;
969 969
      }

Also available in: Unified diff