- Patch #244904 by edkwh, keith.smith: renamed 'input format' to 'text format' based on UMN usability study.

3 files changed, 6 insertions, 6 deletions

diff --git a/modules/php/php.install b/modules/php/php.install
index e65607019..e8641e7d9 100644
--- a/modules/php/php.install
+++ b/modules/php/php.install
@@ -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))));
   }
 }
 
diff --git a/modules/php/php.module b/modules/php/php.module
index cf7dea43d..de7371b7f 100644
--- a/modules/php/php.module
+++ b/modules/php/php.module
@@ -44,7 +44,7 @@ function php_filter_tips($delta, $format, $long = FALSE) {
         $output .= '<li>' . t('Consider including your custom PHP code within a site-specific module or <code>template.php</code> file rather than embedding it directly into a post or block.') . '</li>';
         $output .= '<li>' . 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.') . '</li></ul>';
         $output .= '<p>' . t('A basic example: <em>Creating a "Welcome" block that greets visitors with a simple message.</em>') . '</p>';
-        $output .= '<ul><li>' . t('<p>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:</p>
+        $output .= '<ul><li>' . t('<p>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:</p>
 <pre>
 print t(\'Welcome visitor! Thank you for visiting.\');
 </pre>') . '</li>';
diff --git a/modules/php/php.test b/modules/php/php.test
index 6ee4f3a59..84ddb6c55 100644
--- a/modules/php/php.test
+++ b/modules/php/php.test
@@ -13,7 +13,7 @@ class PHPTestCase extends DrupalWebTestCase {
     $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 PHPTestCase {
     $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 PHPTestCase {
     $this->drupalGet('node/' . $node->nid . '/edit');
     $this->assertNoFieldByName('body_format', '3', t('Format not available.'));
   }
-}
\ No newline at end of file
+}