From aec10a8c7df942ce53b656ae6494c1e08ee6ea17 Mon Sep 17 00:00:00 2001 From: Dries Buytaert <dries@buytaert.net> Date: Sat, 6 Mar 2010 06:39:01 +0000 Subject: [PATCH] - Patch #734146 by scor: white-space clean-up. --- includes/common.inc | 4 ++-- includes/database/pgsql/schema.inc | 2 +- modules/filter/filter.module | 8 ++++---- modules/filter/filter.test | 4 ++-- modules/node/node.api.php | 2 +- modules/node/node.test | 2 +- modules/openid/openid.inc | 4 ++-- modules/overlay/overlay-parent.js | 4 ++-- modules/poll/poll.test | 2 +- modules/shortcut/shortcut.admin.inc | 2 +- modules/simpletest/simpletest.css | 2 +- modules/system/system.api.php | 4 ++-- modules/system/system.test | 2 +- modules/taxonomy/taxonomy.install | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/includes/common.inc b/includes/common.inc index b90618198994..3d03d5ccecd8 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3014,7 +3014,7 @@ function drupal_pre_render_styles($elements) { // IE's limit of 31 total CSS inclusion tags. // - The group contains items not eligible for aggregation (their // 'preprocess' flag has been set to FALSE): in this case, output a LINK - // tag for each file. + // tag for each file. case 'file': // The group has been aggregated into a single file: output a LINK tag // for the aggregate file. @@ -4634,7 +4634,7 @@ function drupal_set_page_content($content = NULL) { * containing an expression for Internet Explorer to evaluate as part of a * conditional comment. For example, this can be set to 'lt IE 7' for the * element to be rendered in Internet Explorer 6, but not in Internet - * Explorer 7 or higher. Defaults to TRUE. + * Explorer 7 or higher. Defaults to TRUE. * - '!IE': If FALSE, the element is not rendered by browsers other than * Internet Explorer. If TRUE, the element is rendered by those browsers. * Defaults to TRUE. diff --git a/includes/database/pgsql/schema.inc b/includes/database/pgsql/schema.inc index 679efbde8257..1306bbd3aa24 100644 --- a/includes/database/pgsql/schema.inc +++ b/includes/database/pgsql/schema.inc @@ -346,7 +346,7 @@ public function dropField($table, $field) { if (!$this->columnExists($table, $field)) { return FALSE; } - + $this->connection->query('ALTER TABLE {' . $table . '} DROP COLUMN "' . $field . '"'); return TRUE; } diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 389d8843665d..f2cf72be1fbe 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -873,7 +873,7 @@ function filter_dom_serialize($dom_document) { foreach($body_node->getElementsByTagName('style') as $node) { filter_dom_serialize_escape_cdata_element($dom_document, $node, '/*', '*/'); } - + foreach ($body_node->childNodes as $child_node) { $body_content .= $dom_document->saveXML($child_node); } @@ -882,14 +882,14 @@ function filter_dom_serialize($dom_document) { /** * Adds comments around the <!CDATA section in a dom element. - * + * * DOMDocument::loadHTML in filter_dom_load() makes CDATA sections from the * contents of inline script and style tags. This can cause HTML 4 browsers to * throw exceptions. - * + * * This function attempts to solve the problem by creating a DocumentFragment * and immitating the behavior in drupal_get_js(), commenting the CDATA tag. - * + * * @param $dom_document * The DOMDocument containing the $dom_element. * @param $dom_element diff --git a/modules/filter/filter.test b/modules/filter/filter.test index 4de212d347d7..46159b23c61e 100644 --- a/modules/filter/filter.test +++ b/modules/filter/filter.test @@ -1087,10 +1087,10 @@ alert("test") //--><!]]> </script></p>', t('HTML corrector -- CDATA added to a nested script element')); - $f = _filter_htmlcorrector('<p><style> /* Styling */ body {color:red} </style></p>'); + $f = _filter_htmlcorrector('<p><style> /* Styling */ body {color:red}</style></p>'); $this->assertEqual($f, '<p><style> <!--/*--><![CDATA[/* ><!--*/ - /* Styling */ body {color:red} + /* Styling */ body {color:red} /*--><!]]>*/ </style></p>', t('HTML corrector -- CDATA added to a style element.')); } diff --git a/modules/node/node.api.php b/modules/node/node.api.php index 3c7a409b1687..b1009f7e7b27 100644 --- a/modules/node/node.api.php +++ b/modules/node/node.api.php @@ -97,7 +97,7 @@ * above): * - hook_prepare() (node-type-specific) * - hook_node_prepare() (all); if translation.module is enabled, this will - * also invoke hook_node_prepare_translation() on all modules. + * also invoke hook_node_prepare_translation() on all modules. * - hook_form() (node-type-specific) * - field_attach_form() * - Validating a node during editing form submit (calling diff --git a/modules/node/node.test b/modules/node/node.test index 82428f848c62..c302d9bca6f9 100644 --- a/modules/node/node.test +++ b/modules/node/node.test @@ -1509,7 +1509,7 @@ class NodeQueryAlter extends DrupalWebTestCase { * Verifies that a non-standard table alias can be used, and that a * user with node access can view the nodes. */ - function testNodeQueryAlterLowLevelWithAccess() { + function testNodeQueryAlterLowLevelWithAccess() { // User with access should be able to view 4 nodes. try { $query = db_select('node', 'mytab') diff --git a/modules/openid/openid.inc b/modules/openid/openid.inc index db1a66096d24..a1f3b90b4f06 100644 --- a/modules/openid/openid.inc +++ b/modules/openid/openid.inc @@ -561,10 +561,10 @@ function _openid_get_params($str) { * openid.[prefix].[key2] = [value2] * ... * @endcode - * + * * This function extracts all the keys belonging to an extension namespace in a * response, optionally using a fallback prefix if none is provided in the response. - * + * * Note that you cannot assume that a given extension namespace will use the same * prefix on the response and the request: each party may use a different prefix * to refer to the same namespace. diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index b0df0890da0d..02fa8ab51510 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -465,7 +465,7 @@ Drupal.overlay.bindChild = function (iframeWindow, isClosing) { $tabs.removeAttr('class'); } - // Re-attach the behaviors we lost while copying elements from the iframe + // Re-attach the behaviors we lost while copying elements from the iframe // document to the parent document. Drupal.attachBehaviors(self.$dialogTitlebar); @@ -693,7 +693,7 @@ Drupal.overlay.clickHandler = function (event) { return; } - // Only continue if clicked target (or one of its parents) is a link. + // Only continue if clicked target (or one of its parents) is a link. if (!$target.is('a')) { $target = $target.closest('a'); if (!$target.length) { diff --git a/modules/poll/poll.test b/modules/poll/poll.test index 80af43ebf390..2b5b43efb5c4 100644 --- a/modules/poll/poll.test +++ b/modules/poll/poll.test @@ -372,7 +372,7 @@ class PollVoteCheckHostname extends PollTestCase { 'vote on polls' => TRUE, )); - // Create poll. + // Create poll. $title = $this->randomName(); $choices = $this->_generateChoices(3); $this->poll_nid = $this->pollCreate($title, $choices, FALSE); diff --git a/modules/shortcut/shortcut.admin.inc b/modules/shortcut/shortcut.admin.inc index f3f1500ba3a5..3601a5b0cbfd 100644 --- a/modules/shortcut/shortcut.admin.inc +++ b/modules/shortcut/shortcut.admin.inc @@ -630,7 +630,7 @@ function shortcut_set_delete_form($form, &$form_state, $shortcut_set) { } $form['info'] = array( - '#markup' => $info, + '#markup' => $info, ); return confirm_form( diff --git a/modules/simpletest/simpletest.css b/modules/simpletest/simpletest.css index dab817178d64..9fea7697b792 100644 --- a/modules/simpletest/simpletest.css +++ b/modules/simpletest/simpletest.css @@ -89,4 +89,4 @@ a.simpletest-collapse:hover { overflow: visible; position: relative; z-index: 1000; -} \ No newline at end of file +} diff --git a/modules/system/system.api.php b/modules/system/system.api.php index 1ed92dfe3544..02a60780dd8f 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -1560,7 +1560,7 @@ function hook_modules_uninstalled($modules) { * - 'description' A string with a short description of what the wrapper does. * - 'type' A bitmask of flags indicating what type of streams this wrapper * will access - local or remote, readable and/or writeable, etc. Many - * shortcut constants are defined in stream_wrappers.inc. + * shortcut constants are defined in stream_wrappers.inc. * * @see file_get_stream_wrappers() * @see hook_stream_wrappers_alter() @@ -2132,7 +2132,7 @@ function hook_install() { * Perform a single update. * * For each patch which requires a database change add a new hook_update_N() - * which will be called by update.php. The database updates are numbered + * which will be called by update.php. The database updates are numbered * sequentially according to the version of Drupal you are compatible with. * * Schema updates should adhere to the Schema API: diff --git a/modules/system/system.test b/modules/system/system.test index 480d322e4577..c5366c541f0e 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -1710,4 +1710,4 @@ class ShutdownFunctionsTest extends DrupalWebTestCase { $this->assertText(t('First shutdown function, arg1 : @arg1, arg2: @arg2', array('@arg1' => $arg1, '@arg2' => $arg2))); $this->assertText(t('Second shutdown function, arg1 : @arg1, arg2: @arg2', array('@arg1' => $arg1, '@arg2' => $arg2))); } -} \ No newline at end of file +} diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install index 1a98b0d75ab6..94c19d4648ce 100644 --- a/modules/taxonomy/taxonomy.install +++ b/modules/taxonomy/taxonomy.install @@ -225,7 +225,7 @@ function taxonomy_update_dependencies() { $dependencies['node'][7006] = array( 'taxonomy' => 7002, ); - + return $dependencies; } -- GitLab