diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.input_formats.inc b/drupal/sites/all/features/boinc_standard/boinc_standard.input_formats.inc index 0fdb66272e..ee02a1f0ee 100644 --- a/drupal/sites/all/features/boinc_standard/boinc_standard.input_formats.inc +++ b/drupal/sites/all/features/boinc_standard/boinc_standard.input_formats.inc @@ -84,31 +84,12 @@ function boinc_standard_input_formats() { // Numbering suffix 'tableofcontents_number_end_letter' => '.', ), - // Settings for: htmlpurifier module - 'htmlpurifier' => array( - 'htmlpurifier_clear_cac' => array( - '#description' => NULL, - '#value' => 'Clear cache (Warning: Can result in performance degradation)', - ), - // Display help text - 'htmlpurifier_help' => 0, - 'htmlpurifier_config' => array( - '#description' => NULL, - '#value' => array( - 'Attr.EnableID' => '0', - 'AutoFormat.AutoParagraph' => '1', - 'AutoFormat.Linkify' => '0', - 'AutoFormat.RemoveEmpty' => '0', - 'Null_HTML.Allowed' => '1', - 'HTML.ForbiddenAttributes' => '', - 'HTML.ForbiddenElements' => '', - 'HTML.SafeObject' => '1', - 'Output.FlashCompat' => '1', - 'URI.DisableExternalResources' => '0', - 'URI.DisableResources' => '0', - 'Null_URI.Munge' => '1', - ), - ), + // Settings for: pathologic module + 'pathologic' => array( + // Also considered local + 'filter_pathologic_local_paths' => '/', + // Output full absolute URLs + 'filter_pathologic_absolute' => 1, ), // Settings for: bbcode module 'bbcode' => array( @@ -119,15 +100,35 @@ function boinc_standard_input_formats() { // Email address encoding 'bbcode_encode_mailto' => '1', // Smart paragraph and line breaks - 'bbcode_paragraph_breaks' => '0', + 'bbcode_paragraph_breaks' => '2', // Print debugging info 'bbcode_debug' => '0', ), - // Settings for: pathologic module - 'pathologic' => array( - // Also considered local - 'filter_pathologic_local_paths' => '/', - 'filter_pathologic_absolute' => 1, + // Settings for: htmlpurifier module + 'htmlpurifier' => array( + 'htmlpurifier_clear_cac' => array( + '#description' => NULL, + '#value' => 'Clear cache (Warning: Can result in performance degradation)', + ), + // Display help text + 'htmlpurifier_help' => 1, + 'htmlpurifier_config' => array( + '#description' => NULL, + '#value' => array( + 'Attr.EnableID' => '0', + 'AutoFormat.AutoParagraph' => '1', + 'AutoFormat.Linkify' => '1', + 'AutoFormat.RemoveEmpty' => '0', + 'Null_HTML.Allowed' => '1', + 'HTML.ForbiddenAttributes' => '', + 'HTML.ForbiddenElements' => '', + 'HTML.SafeObject' => '0', + 'Output.FlashCompat' => '0', + 'URI.DisableExternalResources' => '0', + 'URI.DisableResources' => '0', + 'Null_URI.Munge' => '1', + ), + ), ), ); $input_format->filters = array( @@ -135,20 +136,21 @@ function boinc_standard_input_formats() { // Delta => Weight for: Table of contents '0' => '-10', ), - 'htmlpurifier' => array( - // Delta => Weight for: HTML Purifier + 'pathologic' => array( + // Delta => Weight for: Pathologic '0' => '-9', ), 'bbcode' => array( // Delta => Weight for: BBCode '0' => '-8', ), - 'pathologic' => array( - // Delta => Weight for: Pathologic + 'htmlpurifier' => array( + // Delta => Weight for: HTML Purifier '0' => '-7', ), 'image_caption_filter' => array( - '0' => '10', + // Delta => Weight for: Image caption filter + '0' => '-6', ), ); $input_format->machine = 'rich_text';