' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The blocks administration page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/build/block'))) . '
'; - $output .= '' . t('Although blocks are usually generated automatically by modules (like the User login block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available input format.', array('@input-format' => url('admin/settings/filters'))) . '
'; + $output .= '' . t('Although blocks are usually generated automatically by modules (like the User login block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available text format.', array('@text-format' => url('admin/settings/filter'))) . '
'; $output .= '' . t('When working with blocks, remember that:') . '
'; $output .= '' . t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Read/Write to allow comments, or Disabled, to prevent comments. Comment display settings and other controls may also be customized for each content type.', array('@content-type' => url('admin/build/types'))) . '
'; - $output .= '' . t('Comment permissions are assigned to user roles, and are used to determine whether anonymous users (or other roles) are allowed to comment on posts. If anonymous users are allowed to comment, their individual contact information may be retained in cookies stored on their local computer for use in later comment submissions. When a comment has no replies, it may be (optionally) edited by its author. The comment module uses the same input formats and HTML tags available when creating other forms of content.') . '
'; + $output .= '' . t('Comment permissions are assigned to user roles, and are used to determine whether anonymous users (or other roles) are allowed to comment on posts. If anonymous users are allowed to comment, their individual contact information may be retained in cookies stored on their local computer for use in later comment submissions. When a comment has no replies, it may be (optionally) edited by its author. The comment module uses the same text formats and HTML tags available when creating other forms of content.') . '
'; $output .= '' . t('For more information, see the online handbook entry for Comment module.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) . '
'; return $output; @@ -1562,7 +1562,7 @@ function comment_form_add_preview($form, // Invoke full validation for the form, to protect against cross site // request forgeries (CSRF) and setting arbitrary values for fields such as - // the input format. Preview the comment only when form validation does not + // the text format. Preview the comment only when form validation does not // set any errors. drupal_validate_form($form['form_id']['#value'], $form, $form_state); if (!form_get_errors()) { Index: modules/filter/filter.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v retrieving revision 1.19 diff -u -p -r1.19 filter.admin.inc --- modules/filter/filter.admin.inc 3 Dec 2008 19:43:21 -0000 1.19 +++ modules/filter/filter.admin.inc 24 Dec 2008 17:42:00 -0000 @@ -7,7 +7,7 @@ */ /** - * Menu callback; Displays a list of all input formats and which + * Menu callback; Displays a list of all text formats and which * one is the default. * * @ingroup forms @@ -31,9 +31,9 @@ function filter_admin_overview() { $default = ($id == variable_get('filter_default_format', 1)); $options[$id] = ''; $form[$id]['name'] = array('#markup' => $format->name); - $form[$id]['roles'] = array('#markup' => $default ? t('All roles may use default format') : ($roles ? implode(', ', $roles) : t('No roles may use this format'))); - $form[$id]['configure'] = array('#markup' => l(t('configure'), 'admin/settings/filters/' . $id)); - $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/settings/filters/delete/' . $id)); + $form[$id]['roles'] = array('#markup' => $default ? t('All roles may use the default format') : ($roles ? implode(', ', $roles) : t('No roles may use this format'))); + $form[$id]['configure'] = array('#markup' => l(t('configure'), 'admin/settings/filter/' . $id)); + $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/settings/filter/delete/' . $id)); $form[$id]['weight'] = array('#type' => 'weight', '#default_value' => $format->weight); } $form['default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('filter_default_format', 1)); @@ -53,7 +53,7 @@ function filter_admin_overview_submit($f db_query("UPDATE {filter_format} SET weight = %d WHERE format = %d", $data['weight'], $id); } } - drupal_set_message(t('The input format ordering has been saved.')); + drupal_set_message(t('The text format ordering has been saved.')); } /** @@ -94,7 +94,7 @@ function theme_filter_admin_overview($fo */ function filter_admin_format_page($format = NULL) { if (!isset($format->name)) { - drupal_set_title(t('Add input format'), PASS_THROUGH); + drupal_set_title(t('Add text format'), PASS_THROUGH); $format = (object)array('name' => '', 'roles' => '', 'format' => ''); } return drupal_get_form('filter_admin_format_form', $format); @@ -166,7 +166,7 @@ function filter_admin_format_form(&$form else { $tiplist .= theme('filter_tips_more_info'); } - $group = '' . t('These are the guidelines that users will see for posting in this input format. They are automatically generated from the filter settings.') . '
'; + $group = '' . t('These are the guidelines that users will see for posting in this text format. They are automatically generated from the filter settings.') . '
'; $group .= $tiplist; $form['tips'] = array('#markup' => '' . 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('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("The filter module allows administrators to configure text formats for use on your site. A text 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 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 formats may be created by an administrator.") . '
'; + $output .= '' . t('Each text format uses filters to manipulate text, and most 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 text format can use the Text format fieldset to choose between available text formats when creating or editing multi-line content. Administrators determine the text formats available to each user role, select a default text format, and control the order of formats listed in the Text format fieldset.') . '
'; $output .= '' . t('For more information, see the online handbook entry for Filter module.', array('@filter' => 'http://drupal.org/handbook/modules/filter/')) . '
'; return $output; - case 'admin/settings/filters': - $output = '' . t('Use the list below to review the input formats available to each user role, to select a default input format, and to control the order of formats listed in the Input format fieldset. (The Input format fieldset is displayed below textareas when users with access to more than one input format create multi-line content.) The input format selected as Default is available to all users and, unless another format is selected, is applied to all content. All input formats are available to users in roles with the "administer filters" permission.') . '
'; - $output .= '' . t('Since input formats, if available, are presented in the same order as the list below, it may be helpful to arrange the formats in descending order of your preference for their use. To change the order of an input format, grab a drag-and-drop handle under the Name column and drag to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the Save changes button at the bottom of the page.') . '
'; + case 'admin/settings/filter': + $output = '' . t('Use the list below to review the text formats available to each user role, to select a default text format, and to control the order of formats listed in the Text format fieldset. (The Text format fieldset is displayed below textareas when users with access to more than one text format create multi-line content.) The text format selected as Default is available to all users and, unless another format is selected, is applied to all content. All text formats are available to users in roles with the "administer filters" permission.') . '
'; + $output .= '' . t('Since text formats, if available, are presented in the same order as the list below, it may be helpful to arrange the formats in descending order of your preference for their use. To change the order of an text format, grab a drag-and-drop handle under the Name column and drag to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the Save changes button at the bottom of the page.') . '
'; return $output; - case 'admin/settings/filters/%': - return '' . t('Every filter performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this input format. If you notice some filters are causing conflicts in the output, you can rearrange them.', array('@rearrange' => url('admin/settings/filters/' . $arg[3] . '/order'))) . '
'; - case 'admin/settings/filters/%/configure': - return '' . t('If you cannot find the settings for a certain filter, make sure you have enabled it on the edit tab first.', array('@url' => url('admin/settings/filters/' . $arg[3]))) . '
'; - case 'admin/settings/filters/%/order': + case 'admin/settings/filter/%': + return '' . t('Every filter performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this format. If you notice some filters are causing conflicts in the output, you can rearrange them.', array('@rearrange' => url('admin/settings/filter/' . $arg[3] . '/order'))) . '
'; + case 'admin/settings/filter/%/configure': + return '' . t('If you cannot find the settings for a certain filter, make sure you have enabled it on the edit tab first.', array('@url' => url('admin/settings/filter/' . $arg[3]))) . '
'; + case 'admin/settings/filter/%/order': $output = '' . t('Because of the flexible filtering system, you might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted to a clickable link. When this happens, rearrange the order of the filters.') . '
'; $output .= '' . t("Filters are executed from top-to-bottom. To change the order of the filters, modify the values in the Weight column or grab a drag-and-drop handle under the Name column and drag filters to new locations in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the Save configuration button at the bottom of the page.") . '
'; return $output; @@ -67,26 +67,26 @@ function filter_theme() { * Implementation of hook_menu(). */ function filter_menu() { - $items['admin/settings/filters'] = array( - 'title' => 'Input formats', + $items['admin/settings/filter'] = array( + 'title' => 'Text formats', 'description' => 'Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.', 'page callback' => 'drupal_get_form', 'page arguments' => array('filter_admin_overview'), 'access arguments' => array('administer filters'), ); - $items['admin/settings/filters/list'] = array( + $items['admin/settings/filter/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, ); - $items['admin/settings/filters/add'] = array( - 'title' => 'Add input format', + $items['admin/settings/filter/add'] = array( + 'title' => 'Add text format', 'page callback' => 'filter_admin_format_page', 'access arguments' => array('administer filters'), 'type' => MENU_LOCAL_TASK, 'weight' => 1, ); - $items['admin/settings/filters/delete'] = array( - 'title' => 'Delete input format', + $items['admin/settings/filter/delete'] = array( + 'title' => 'Delete text format', 'page callback' => 'drupal_get_form', 'page arguments' => array('filter_admin_delete'), 'access arguments' => array('administer filters'), @@ -98,7 +98,7 @@ function filter_menu() { 'access callback' => TRUE, 'type' => MENU_SUGGESTED_ITEM, ); - $items['admin/settings/filters/%filter_format'] = array( + $items['admin/settings/filter/%filter_format'] = array( 'type' => MENU_CALLBACK, 'title callback' => 'filter_admin_format_title', 'title arguments' => array(3), @@ -106,12 +106,12 @@ function filter_menu() { 'page arguments' => array(3), 'access arguments' => array('administer filters'), ); - $items['admin/settings/filters/%filter_format/edit'] = array( + $items['admin/settings/filter/%filter_format/edit'] = array( 'title' => 'Edit', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 0, ); - $items['admin/settings/filters/%filter_format/configure'] = array( + $items['admin/settings/filter/%filter_format/configure'] = array( 'title' => 'Configure', 'page callback' => 'filter_admin_configure_page', 'page arguments' => array(3), @@ -119,7 +119,7 @@ function filter_menu() { 'type' => MENU_LOCAL_TASK, 'weight' => 1, ); - $items['admin/settings/filters/%filter_format/order'] = array( + $items['admin/settings/filter/%filter_format/order'] = array( 'title' => 'Rearrange', 'page callback' => 'filter_admin_order_page', 'page arguments' => array(3), @@ -148,7 +148,7 @@ function filter_perm() { return array( 'administer filters' => array( 'title' => t('Administer filters'), - 'description' => t('Manage input formats and filters, and select which roles may use them. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), + 'description' => t('Manage text formats and filters, and select which roles may use them. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), ); } @@ -283,13 +283,13 @@ function filter_filter_tips($delta, $for } /** - * Retrieve a list of input formats. + * Retrieve a list of text formats. */ function filter_formats($index = NULL) { global $user; static $formats; - // Administrators can always use all input formats. + // Administrators can always use all text formats. $all = user_access('administer filters'); if (!isset($formats)) { @@ -355,7 +355,7 @@ function filter_resolve_format($format) return $format == FILTER_FORMAT_DEFAULT ? variable_get('filter_default_format', 1) : $format; } /** - * Check if text in a certain input format is allowed to be cached. + * Check if text in a certain text format is allowed to be cached. */ function filter_format_allowcache($format) { static $cache = array(); @@ -472,9 +472,9 @@ function check_markup($text, $format = F * @param $value * The ID of the format that is currently selected. * @param $weight - * The weight of the input format. + * The weight of the text format. * @param $parents - * Required when defining multiple input formats on a single node or having a different parent than 'format'. + * Required when defining multiple text formats on a single node or having a different parent than 'format'. * @return * HTML for the form element. */ @@ -487,7 +487,7 @@ function filter_form($value = FILTER_FOR if (count($formats) > 1) { $form = array( '#type' => 'fieldset', - '#title' => t('Input format'), + '#title' => t('Text format'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => $weight, @@ -952,7 +952,7 @@ function filter_xss($string, $allowed_ta if (!drupal_validate_utf8($string)) { return ''; } - // Store the input format + // Store the text format _filter_xss_split($allowed_tags, TRUE); // Remove NUL characters (ignored by some browsers) $string = str_replace(chr(0), '', $string); Index: modules/filter/filter.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.pages.inc,v retrieving revision 1.5 diff -u -p -r1.5 filter.pages.inc --- modules/filter/filter.pages.inc 20 Dec 2008 18:24:36 -0000 1.5 +++ modules/filter/filter.pages.inc 24 Dec 2008 17:42:00 -0000 @@ -28,7 +28,7 @@ function filter_tips_long() { * @param $tips * An array containing descriptions and a CSS id in the form of * 'module-name/filter-id' (only used when $long is TRUE) for each input - * filter in one or more input formats. Example: + * filter in one or more text formats. Example: * @code * array( * 'Full HTML' => array( @@ -53,7 +53,7 @@ function theme_filter_tips($tips, $long $multiple = count($tips) > 1; if ($multiple) { - $output = t('Input formats') . ':'; + $output = t('Text formats') . ':'; } if (count($tips)) { Index: modules/filter/filter.test =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v retrieving revision 1.11 diff -u -p -r1.11 filter.test --- modules/filter/filter.test 5 Dec 2008 22:18:44 -0000 1.11 +++ modules/filter/filter.test 24 Dec 2008 17:42:00 -0000 @@ -28,15 +28,15 @@ class FilterAdminTestCase extends Drupal // Change default filter. $edit = array(); $edit['default'] = $full; - $this->drupalPost('admin/settings/filters', $edit, t('Save changes')); + $this->drupalPost('admin/settings/filter', $edit, t('Save changes')); $this->assertText(t('Default format updated.'), t('Default filter updated successfully.')); - $this->assertNoRaw('admin/settings/filters/delete/' . $full, t('Delete link not found.')); + $this->assertNoRaw('admin/settings/filter/delete/' . $full, t('Delete link not found.')); // Add an additional tag. $edit = array(); $edit['allowed_html_1'] = ' -
-
- ' . '
'; // Adding tag.
- $this->drupalPost('admin/settings/filters/' . $filtered . '/configure', $edit, t('Save configuration'));
+ $this->drupalPost('admin/settings/filter/' . $filtered . '/configure', $edit, t('Save configuration'));
$this->assertText(t('The configuration options have been saved.'), t('Allowed HTML tag added.'));
$this->assertRaw(htmlentities($edit['allowed_html_1']), t('Tag displayed.'));
@@ -48,7 +48,7 @@ class FilterAdminTestCase extends Drupal
$edit = array();
$edit['weights[filter/' . $second_filter . ']'] = 1;
$edit['weights[filter/' . $first_filter . ']'] = 2;
- $this->drupalPost('admin/settings/filters/' . $filtered . '/order', $edit, t('Save configuration'));
+ $this->drupalPost('admin/settings/filter/' . $filtered . '/order', $edit, t('Save configuration'));
$this->assertText(t('The filter ordering has been saved.'), t('Order saved successfully.'));
$result = db_query('SELECT * FROM {filter} WHERE format = %d ORDER BY weight ASC', $filtered);
@@ -66,8 +66,8 @@ class FilterAdminTestCase extends Drupal
$edit['roles[2]'] = TRUE;
$edit['filters[filter/' . $second_filter . ']'] = TRUE;
$edit['filters[filter/' . $first_filter . ']'] = TRUE;
- $this->drupalPost('admin/settings/filters/add', $edit, t('Save configuration'));
- $this->assertRaw(t('Added input format %format.', array('%format' => $edit['name'])), t('New filter created.'));
+ $this->drupalPost('admin/settings/filter/add', $edit, t('Save configuration'));
+ $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), t('New filter created.'));
$format = $this->getFilter($edit['name']);
$this->assertNotNull($format, t('Format found in database.'));
@@ -78,23 +78,23 @@ class FilterAdminTestCase extends Drupal
$this->assertFieldByName('filters[filter/' . $first_filter . ']', '', t('Url filter found.'));
// Delete new filter.
- $this->drupalPost('admin/settings/filters/delete/' . $format->format, array(), t('Delete'));
- $this->assertRaw(t('Deleted input format %format.', array('%format' => $edit['name'])), t('Format successfully deleted.'));
+ $this->drupalPost('admin/settings/filter/delete/' . $format->format, array(), t('Delete'));
+ $this->assertRaw(t('Deleted text format %format.', array('%format' => $edit['name'])), t('Format successfully deleted.'));
}
// Change default filter back.
$edit = array();
$edit['default'] = $filtered;
- $this->drupalPost('admin/settings/filters', $edit, t('Save changes'));
+ $this->drupalPost('admin/settings/filter', $edit, t('Save changes'));
$this->assertText(t('Default format updated.'), t('Default filter updated successfully.'));
- $this->assertNoRaw('admin/settings/filters/delete/' . $filtered, t('Delete link not found.'));
+ $this->assertNoRaw('admin/settings/filter/delete/' . $filtered, t('Delete link not found.'));
// Allow authenticated users on full HTML.
$edit = array();
$edit['roles[2]'] = TRUE;
- $this->drupalPost('admin/settings/filters/' . $full, $edit, t('Save configuration'));
- $this->assertText(t('The input format settings have been updated.'), t('Full HTML format successfully updated.'));
+ $this->drupalPost('admin/settings/filter/' . $full, $edit, t('Save configuration'));
+ $this->assertText(t('The text format settings have been updated.'), t('Full HTML format successfully updated.'));
// Switch user.
$this->drupalLogout();
@@ -128,20 +128,20 @@ class FilterAdminTestCase extends Drupal
// Allowed tags.
$edit = array();
$edit['allowed_html_1'] = ' -
-
- ';
- $this->drupalPost('admin/settings/filters/' . $filtered . '/configure', $edit, t('Save configuration'));
+ $this->drupalPost('admin/settings/filter/' . $filtered . '/configure', $edit, t('Save configuration'));
$this->assertText(t('The configuration options have been saved.'), t('Changes reverted.'));
// Full HTML.
$edit = array();
$edit['roles[2]'] = FALSE;
- $this->drupalPost('admin/settings/filters/' . $full, $edit, t('Save configuration'));
- $this->assertText(t('The input format settings have been updated.'), t('Full HTML format successfully reverted.'));
+ $this->drupalPost('admin/settings/filter/' . $full, $edit, t('Save configuration'));
+ $this->assertText(t('The text format settings have been updated.'), t('Full HTML format successfully reverted.'));
// Filter order.
$edit = array();
$edit['weights[filter/' . $second_filter . ']'] = 2;
$edit['weights[filter/' . $first_filter . ']'] = 1;
- $this->drupalPost('admin/settings/filters/' . $filtered . '/order', $edit, t('Save configuration'));
+ $this->drupalPost('admin/settings/filter/' . $filtered . '/order', $edit, t('Save configuration'));
$this->assertText(t('The filter ordering has been saved.'), t('Order successfully reverted.'));
}
@@ -216,14 +216,14 @@ class FilterTestCase extends DrupalWebTe
'roles[2]' => TRUE,
'filters[filter/' . $filter . ']' => TRUE,
);
- $this->drupalPost('admin/settings/filters/add', $edit, t('Save configuration'));
+ $this->drupalPost('admin/settings/filter/add', $edit, t('Save configuration'));
return db_fetch_object(db_query("SELECT * FROM {filter_format} WHERE name = '%s'", $edit['name']));
}
function deleteFormat($format) {
if ($format !== NULL) {
// Delete new filter.
- $this->drupalPost('admin/settings/filters/delete/' . $format->format, array(), t('Delete'));
+ $this->drupalPost('admin/settings/filter/delete/' . $format->format, array(), t('Delete'));
}
}
}
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.9
diff -u -p -r1.9 node.install
--- modules/node/node.install 3 Dec 2008 16:32:21 -0000 1.9
+++ modules/node/node.install 24 Dec 2008 17:42:00 -0000
@@ -264,7 +264,7 @@ function node_schema() {
'default' => 0,
),
'format' => array(
- 'description' => "The input format used by this version's body.",
+ 'description' => "The text format used by this version's body.",
'type' => 'int',
'not null' => TRUE,
'default' => 0,
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.12
diff -u -p -r1.12 node.test
--- modules/node/node.test 16 Dec 2008 23:57:32 -0000 1.12
+++ modules/node/node.test 24 Dec 2008 17:42:00 -0000
@@ -210,7 +210,7 @@ class NodeTeaserTestCase extends DrupalW
// The teasers we expect node_teaser() to return when $size is the index
// of each array item.
- // Using an input format with no line-break filter:
+ // Using an text format with no line-break filter:
$teasers = array(
"
\nHi\n
\n\nfolks\n
\n!\n
",
"<",
@@ -252,7 +252,7 @@ class NodeTeaserTestCase extends DrupalW
"\nHi\n
\n\nfolks\n
\n!\n
",
);
- // And Using an input format WITH the line-break filter.
+ // And Using an text format WITH the line-break filter.
$teasers_lb = array(
"\nHi\n
\n\nfolks\n
\n!\n
",
"<",
Index: modules/php/php.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.install,v
retrieving revision 1.3
diff -u -p -r1.3 php.install
--- modules/php/php.install 3 Dec 2008 16:32:22 -0000 1.3
+++ modules/php/php.install 24 Dec 2008 17:42:00 -0000
@@ -6,7 +6,7 @@
*/
function php_install() {
$format_exists = db_result(db_query("SELECT COUNT(*) FROM {filter_format} WHERE name = 'PHP code'"));
- // Add a PHP code input format, if it does not exist. Do this only for the
+ // Add a PHP code text format, if it does not exist. Do this only for the
// first install (or if the format has been manually deleted) as there is no
// reliable method to identify the format in an uninstall hook or in
// subsequent clean installs.
@@ -17,7 +17,7 @@ function php_install() {
// Enable the PHP evaluator filter.
db_query("INSERT INTO {filter} (format, module, delta, weight) VALUES (%d, 'php', 0, 0)", $format);
- drupal_set_message(t('A !php-code input format has been created.', array('!php-code' => l('PHP code', 'admin/settings/filters/' . $format))));
+ drupal_set_message(t('A !php-code text format has been created.', array('!php-code' => l('PHP code', 'admin/settings/filter/' . $format))));
}
}
Index: modules/php/php.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.module,v
retrieving revision 1.11
diff -u -p -r1.11 php.module
--- modules/php/php.module 19 Sep 2008 07:53:59 -0000 1.11
+++ modules/php/php.module 24 Dec 2008 17:42:00 -0000
@@ -44,7 +44,7 @@ function php_filter_tips($delta, $format
$output .= '- ' . t('Consider including your custom PHP code within a site-specific module or
template.php file rather than embedding it directly into a post or block.') . ' ';
$output .= '- ' . t('Be aware that the ability to embed PHP code within content is provided by the PHP Filter module. If this module is disabled or deleted, then blocks and posts with embedded PHP may display, rather than execute, the PHP code.') . '
';
$output .= '' . t('A basic example: Creating a "Welcome" block that greets visitors with a simple message.') . '
';
- $output .= '- ' . t('
Add a custom block to your site, named "Welcome" . With its input format set to "PHP code" (or another format supporting PHP input), add the following in the Block body:
+ $output .= '- ' . t('
Add a custom block to your site, named "Welcome" . With its text format set to "PHP code" (or another format supporting PHP input), add the following in the Block body:
print t(\'Welcome visitor! Thank you for visiting.\');
') . ' ';
Index: modules/php/php.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.test,v
retrieving revision 1.6
diff -u -p -r1.6 php.test
--- modules/php/php.test 25 Nov 2008 13:14:28 -0000 1.6
+++ modules/php/php.test 24 Dec 2008 17:42:00 -0000
@@ -13,7 +13,7 @@ class PHPTestCase extends DrupalWebTestC
$this->drupalLogin($admin_user);
// Confirm that the PHP filter is #3.
- $this->drupalGet('admin/settings/filters/3');
+ $this->drupalGet('admin/settings/filter/3');
$this->assertText('PHP code', t('On PHP code filter page.'));
}
@@ -53,7 +53,7 @@ class PHPFilterTestCase extends PHPTestC
$edit = array();
$edit['roles[2]'] = TRUE; // Set authenticated users to have permission to use filter.
$this->drupalPost(NULL, $edit, 'Save configuration');
- $this->assertText(t('The input format settings have been updated.'), t('PHP format available to authenticated users.'));
+ $this->assertText(t('The text format settings have been updated.'), t('PHP format available to authenticated users.'));
// Create node with PHP filter enabled.
$web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content'));
@@ -105,4 +105,4 @@ class PHPAccessTestCase extends PHPTestC
$this->drupalGet('node/' . $node->nid . '/edit');
$this->assertNoFieldByName('body_format', '3', t('Format not available.'));
}
-}
\ No newline at end of file
+}
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.293
diff -u -p -r1.293 system.install
--- modules/system/system.install 20 Dec 2008 18:24:40 -0000 1.293
+++ modules/system/system.install 24 Dec 2008 17:42:01 -0000
@@ -384,11 +384,11 @@ 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.
+ // Add text formats.
db_query("INSERT INTO {filter_format} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Filtered HTML', ',1,2,', 1);
db_query("INSERT INTO {filter_format} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Full HTML', '', 1);
- // Enable filters for each input format.
+ // Enable filters for each text format.
// Filtered HTML:
// URL filter.
@@ -1479,7 +1479,7 @@ function system_update_6008() {
function system_update_6009() {
$ret = array();
- // If any input format used the Drupal 5 PHP filter.
+ // If any text format used the Drupal 5 PHP filter.
if (db_result(db_query("SELECT COUNT(format) FROM {filters} WHERE module = 'filter' AND delta = 1"))) {
// Enable the PHP filter module.
$ret[] = update_sql("UPDATE {system} SET status = 1 WHERE name = 'php' AND type = 'module'");
@@ -1679,7 +1679,7 @@ function system_update_6018() {
while ($format = db_fetch_object($result)) {
$weight = db_result(db_query("SELECT MAX(weight) FROM {filters} WHERE format = %d", $format->format));
db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $format->format, 'filter', 3, max(10, $weight + 1));
- $ret[] = array('success' => TRUE, 'query' => "HTML corrector filter added to the '" . $format->name . "' input format.");
+ $ret[] = array('success' => TRUE, 'query' => "HTML corrector filter added to the '" . $format->name . "' text format.");
}
return $ret;