From 9e20dec61348ce137a58a2cce312d8864c54225a Mon Sep 17 00:00:00 2001 From: Bob Vincent Date: Fri, 27 Jan 2012 17:52:31 -0500 Subject: [PATCH] Issue #1419298: Remove trailing whitespacefrom Drupal core text files. Patch generated by running the following commands: perl -pi -e 's, *$,,' $(find core -regex '.*\.\(engine\|html\|inc\|info\|install\|js\|json\|module\|php\|script\|sh\|sql\|test\|txt\|xml\)') git diff core/modules/filter/tests/filter.url-*.txt | patch -p1 -R --- core/includes/database/query.inc | 22 +++++++++++----------- core/includes/database/sqlite/database.inc | 6 +++--- core/misc/collapse.js | 2 +- core/misc/jquery.form.js | 6 +++--- core/modules/dblog/dblog.test | 2 +- core/modules/field/modules/options/options.test | 2 +- core/modules/field_ui/field_ui.js | 2 +- core/modules/shortcut/shortcut.test | 4 ++-- core/modules/simpletest/tests/session.test | 2 +- core/modules/update/update.test | 2 +- core/modules/user/tests/user_form_test.module | 2 +- core/themes/bartik/color/preview.js | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/core/includes/database/query.inc b/core/includes/database/query.inc index 0effedae19cd82f367a8d61c28fc45a8734904e3..917d106476b5a76e14a2783d68b10b1516b54d18 100644 --- a/core/includes/database/query.inc +++ b/core/includes/database/query.inc @@ -83,7 +83,7 @@ interface QueryConditionInterface { /** * Sets a condition that the specified subquery returns values. - * + * * @param SelectQueryInterface $select * The subquery that must contain results. * @@ -91,10 +91,10 @@ interface QueryConditionInterface { * The called object. */ public function exists(SelectQueryInterface $select); - + /** * Sets a condition that the specified subquery returns no values. - * + * * @param SelectQueryInterface $select * The subquery that must not contain results. * @@ -102,7 +102,7 @@ interface QueryConditionInterface { * The called object. */ public function notExists(SelectQueryInterface $select); - + /** * Gets a complete list of all conditions in this conditional clause. * @@ -283,14 +283,14 @@ abstract class Query implements QueryPlaceholderInterface { /** * The target of the connection object. - * + * * @var string */ protected $connectionTarget; /** * The key of the connection object. - * + * * @var string */ protected $connectionKey; @@ -804,7 +804,7 @@ class DeleteQuery extends Query implements QueryConditionInterface { $this->condition->notExists($select); return $this; } - + /** * Implements QueryConditionInterface::conditions(). */ @@ -1053,7 +1053,7 @@ class UpdateQuery extends Query implements QueryConditionInterface { $this->condition->notExists($select); return $this; } - + /** * Implements QueryConditionInterface::conditions(). */ @@ -1545,7 +1545,7 @@ class MergeQuery extends Query implements QueryConditionInterface { $this->condition->notExists($select); return $this; } - + /** * Implements QueryConditionInterface::conditions(). */ @@ -1759,14 +1759,14 @@ class DatabaseCondition implements QueryConditionInterface, Countable { public function exists(SelectQueryInterface $select) { return $this->condition('', $select, 'EXISTS'); } - + /** * Implements QueryConditionInterface::notExists(). */ public function notExists(SelectQueryInterface $select) { return $this->condition('', $select, 'NOT EXISTS'); } - + /** * Implements QueryConditionInterface::conditions(). */ diff --git a/core/includes/database/sqlite/database.inc b/core/includes/database/sqlite/database.inc index 5de219e8d79841d5a359316542645d5f0fffa28a..9b7d31cca1ed610e911a92dc204e1111fb5adf16 100644 --- a/core/includes/database/sqlite/database.inc +++ b/core/includes/database/sqlite/database.inc @@ -37,7 +37,7 @@ class DatabaseConnection_sqlite extends DatabaseConnection { /** * All databases attached to the current database. This is used to allow * prefixes to be safely handled without locking the table - * + * * @var array */ protected $attachedDatabases = array(); @@ -46,10 +46,10 @@ class DatabaseConnection_sqlite extends DatabaseConnection { * Whether or not a table has been dropped this request: the destructor will * only try to get rid of unnecessary databases if there is potential of them * being empty. - * + * * This variable is set to public because DatabaseSchema_sqlite needs to * access it. However, it should not be manually set. - * + * * @var boolean */ var $tableDropped = FALSE; diff --git a/core/misc/collapse.js b/core/misc/collapse.js index 1a98dc0e04cd291d73a4b18ec4f227e9958c01b1..618915102236f4a0beeabb07ae2af394fccc2b91 100644 --- a/core/misc/collapse.js +++ b/core/misc/collapse.js @@ -58,7 +58,7 @@ Drupal.behaviors.collapse = { $('fieldset.collapsible', context).once('collapse', function () { var $fieldset = $(this); // Expand fieldset if there are errors inside, or if it contains an - // element that is targeted by the uri fragment identifier. + // element that is targeted by the uri fragment identifier. var anchor = location.hash && location.hash != '#' ? ', ' + location.hash : ''; if ($('.error' + anchor, $fieldset).length) { $fieldset.removeClass('collapsed'); diff --git a/core/misc/jquery.form.js b/core/misc/jquery.form.js index 4c044b4604a15925f40531d3288b73a05cccb46e..e14b1e43723652ccc81ee85fc74f4bdbc11df562 100644 --- a/core/misc/jquery.form.js +++ b/core/misc/jquery.form.js @@ -91,7 +91,7 @@ $.fn.ajaxSubmit = function(options) { if ( traditional === undefined ) { traditional = $.ajaxSettings.traditional; } - + var qx,n,v,a = this.formToArray(options.semantic); if (options.data) { options.extraData = options.data; @@ -144,7 +144,7 @@ $.fn.ajaxSubmit = function(options) { } options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg - var context = options.context || options; // jQuery 1.4+ supports scope context + var context = options.context || options; // jQuery 1.4+ supports scope context for (var i=0, max=callbacks.length; i < max; i++) { callbacks[i].apply(context, [data, status, xhr || $form, $form]); } @@ -905,7 +905,7 @@ $.fn.ajaxSubmit.debug = false; // helper fn for console logging function log() { - if (!$.fn.ajaxSubmit.debug) + if (!$.fn.ajaxSubmit.debug) return; var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,''); if (window.console && window.console.log) { diff --git a/core/modules/dblog/dblog.test b/core/modules/dblog/dblog.test index ffd3e8a56533dd69762549cc2c8d6b6dc316a423..724d591cc5fdee979ed7a8df20d4f8fef3c2cdb0 100644 --- a/core/modules/dblog/dblog.test +++ b/core/modules/dblog/dblog.test @@ -470,7 +470,7 @@ class DBLogTestCase extends DrupalWebTestCase { $count = $this->getTypeCount($types); $this->assertEqual(array_sum($count), $type['count'], 'Count matched'); } - + // Clear all logs and make sure the confirmation message is found. $this->drupalPost('admin/reports/dblog', array(), t('Clear log messages')); $this->assertText(t('Database log cleared.'), t('Confirmation message found')); diff --git a/core/modules/field/modules/options/options.test b/core/modules/field/modules/options/options.test index ea58f27ff2ea6c5c1db6d3f88001305d50bf34bd..715027969e309936f17cf23283f33fb3a66f302c 100644 --- a/core/modules/field/modules/options/options.test +++ b/core/modules/field/modules/options/options.test @@ -1,7 +1,7 @@ set; - + $new_title = $this->randomName(10); $this->drupalPost('admin/config/user-interface/shortcut/' . $set->set_name . '/edit', array('title' => $new_title), t('Save')); $set = shortcut_set_load($set->set_name); diff --git a/core/modules/simpletest/tests/session.test b/core/modules/simpletest/tests/session.test index 846f6d314c77644cdacf6273db738874b34528d6..c1047c40c23b9e2a5e8efde9c098badcd23eddc6 100644 --- a/core/modules/simpletest/tests/session.test +++ b/core/modules/simpletest/tests/session.test @@ -455,7 +455,7 @@ class SessionHttpsTestCase extends DrupalWebTestCase { } } - // Test that session data saved before login is not available using the + // Test that session data saved before login is not available using the // pre-login anonymous cookie. $this->cookies = array(); $this->drupalGet('session-test/get', array('Cookie: ' . $anonymous_cookie)); diff --git a/core/modules/update/update.test b/core/modules/update/update.test index a657f91de0da642903d3fcc188353e516b4ed8bd..36bdfdad241646b5f1640f3a6103d4bc98938ffc 100644 --- a/core/modules/update/update.test +++ b/core/modules/update/update.test @@ -649,7 +649,7 @@ class UpdateTestUploadCase extends UpdateTestHelper { * Ensure that archiver extensions are properly merged in the UI. */ function testFileNameExtensionMerging() { - $this->drupalGet('admin/modules/install'); + $this->drupalGet('admin/modules/install'); // Make sure the bogus extension supported by update_test.module is there. $this->assertPattern('/file extensions are supported:.*update-test-extension/', t("Found 'update-test-extension' extension")); // Make sure it didn't clobber the first option from core. diff --git a/core/modules/user/tests/user_form_test.module b/core/modules/user/tests/user_form_test.module index 4e907f361b3ceb9028ff625edbe8c1b2469ce99b..a964211e2ca1e3c090e435f66e0943b4f486f30c 100644 --- a/core/modules/user/tests/user_form_test.module +++ b/core/modules/user/tests/user_form_test.module @@ -35,7 +35,7 @@ function user_form_test_current_password($form, &$form_state, $account) { '#description' => t('A field that would require a correct password to change.'), '#required' => TRUE, ); - + $form['current_pass'] = array( '#type' => 'password', '#title' => t('Current password'), diff --git a/core/themes/bartik/color/preview.js b/core/themes/bartik/color/preview.js index b40bcf7dcae1af32a3030664132863e6331c6414..9c0a5d90fbce04850bca3a2c9d2011260a24107b 100644 --- a/core/themes/bartik/color/preview.js +++ b/core/themes/bartik/color/preview.js @@ -8,7 +8,7 @@ $('#preview #preview-logo img').attr('src', Drupal.settings.color.logo); this.logoChanged = true; } - // Remove the logo if the setting is toggled off. + // Remove the logo if the setting is toggled off. if (Drupal.settings.color.logo == null) { $('div').remove('#preview-logo'); } -- 1.7.5.4