'. t("The filter module allows administrators to configure text input formats for use on your site. An input format defines the HTML tags, codes, and other input allowed in both content and comments, and is a key feature in guarding against potentially damaging input from malicious users. Two input formats included by default are Filtered HTML (which allows only an administrator-approved subset of HTML tags) and Full HTML (which allows the full set of HTML tags). Additional input formats may be created by an administrator.") .'
'; + $output = ''. t("The filter module allows administrators to configure text input formats for use on your site. An input format defines the HTML tags, codes, and other input allowed in both content and comments, and is a key feature in guarding against potentially damaging input from malicious users. Two input formats included by default are Restricted HTML (which allows only an administrator-approved subset of HTML tags) and Unfiltered HTML (which allows the full set of HTML tags). Additional input formats may be created by an administrator.") .'
'; $output .= ''. t('Each input format uses filters to manipulate text, and most input formats apply several different filters to text in a specific order. Each filter is designed for a specific purpose, and generally either adds, removes or transforms elements within user-entered text before it is displayed. A filter does not change the actual content of a post, but instead, modifies it temporarily before it is displayed. A filter may remove unapproved HTML tags, for instance, while another automatically adds HTML to make links referenced in text clickable.') .'
'; $output .= ''. t('Users with access to more than one input format can use the Input format fieldset to choose between available input formats when creating or editing multi-line content. Administrators determine the input formats available to each user role, select a default input format, and control the order of formats listed in the Input format fieldset.') .'
'; $output .= ''. t('For more information, see the online handbook entry for Filter module.', array('@filter' => 'http://drupal.org/handbook/modules/filter/')) .'
'; Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.246 diff -u -p -r1.246 system.install --- modules/system/system.install 10 Apr 2008 10:28:23 -0000 1.246 +++ modules/system/system.install 10 Apr 2008 17:22:18 -0000 @@ -381,12 +381,12 @@ function system_install() { db_query("INSERT INTO {node_access} (nid, gid, realm, grant_view, grant_update, grant_delete) VALUES (%d, %d, '%s', %d, %d, %d)", 0, 0, 'all', 1, 0, 0); // Add input formats. - db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Filtered HTML', ',1,2,', 1); - db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Full HTML', '', 1); + db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Restricted HTML', ',1,2,', 1); + db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Unfiltered HTML', '', 1); // Enable filters for each input format. - // Filtered HTML: + // Restricted HTML: // URL filter. db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 1, 'filter', 2, 0); // HTML filter. @@ -396,7 +396,7 @@ function system_install() { // HTML corrector filter. db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 1, 'filter', 3, 10); - // Full HTML: + // Unfiltered HTML: // URL filter. db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 2, 'filter', 2, 0); // Line break filter. @@ -404,8 +404,6 @@ function system_install() { // HTML corrector filter. db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 2, 'filter', 3, 10); - db_query("INSERT INTO {variable} (name, value) VALUES ('%s','%s')", 'filter_html_1', 'i:1;'); - db_query("INSERT INTO {variable} (name, value) VALUES ('%s', '%s')", 'node_options_forum', 'a:1:{i:0;s:6:"status";}'); $cron_key = serialize(md5(mt_rand())); @@ -2846,6 +2844,19 @@ function system_update_7004(&$sandbox) { } /** + * Rename input formats to reflect their purpose. + */ +function system_update_7005() { + $ret = array(); + + // Rename default input formats only if they have not been customized. + $ret[] = update_sql("UPDATE {filter_formats} SET name = 'Restricted HTML' WHERE format = 1 AND name = 'Filtered HTML'"); + $ret[] = update_sql("UPDATE {filter_formats} SET name = 'Unfiltered HTML' WHERE format = 2 AND name = 'Full HTML'"); + + return $ret; +} + +/** * @} End of "defgroup updates-6.x-to-7.x" * The next series of updates should start at 8000. */