Merge pull request #124 from isubit/INTERIM-80

INTERIM-80 Add new filterless text format for footer blocks
isubit · Jun 6, 2017 · be15653 · be15653
2 parents f1cf0e1 + 31ddf95
commit be15653
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/templates/default_region_content_blocks/footer_second.tpl.php b/templates/default_region_content_blocks/footer_second.tpl.php
@@ -1,6 +1,6 @@
-<p><strong>Department of Lorem Ipsum</strong>
-  1234 Street Name
-  Ames IA 50011-1234
-  <a href="mailto:[email protected]">[email protected]</a>
-  515-294-9999 phone
+<p><strong>Department of Lorem Ipsum</strong><br>
+  1234 Street Name<br>
+  Ames IA 50011-1234<br>
+  <a href="mailto:[email protected]">[email protected]</a><br>
+  515-294-9999 phone<br>
   515-294-9999 fax</p>
diff --git a/theme-settings.php b/theme-settings.php
@@ -193,7 +193,16 @@ function suitcase_interim_config_form_submit($form, &$form_state) {
 
   // Populate empty theme regions with default content blocks if provided
 
-  if (module_exists('block') && filter_format_exists('full_html')) {
+  if (module_exists('block')) {
+
+    if (!filter_format_exists('suitcase_interim_block')) {
+      $suitcase_interim_block_format = array(
+        'format' => 'suitcase_interim_block',
+        'name' => 'Suitcase Interim Block',
+      );
+      $suitcase_interim_block_format = (object) $suitcase_interim_block_format;
+      filter_format_save($suitcase_interim_block_format);
+    }
 
     module_load_include('inc', 'block', 'block.admin');
 
@@ -223,7 +232,7 @@ function suitcase_interim_config_form_submit($form, &$form_state) {
           'info' => $block_name,
           'body' => array(
             'value' => theme_render_template($block_template_file->uri, array()),
-            'format' => 'full_html',
+            'format' => 'suitcase_interim_block',
           ),
           'regions' => array(
             'suitcase_interim' => $region_name,