Skip to content

Commit ea1bd56

Browse files
committed
#606526 by axyjo and scor: Remove trailing whitespace and add newlines at end of files. Sorry, folks! But it is after code freeze. :)
1 parent 5f40bd5 commit ea1bd56

37 files changed

Lines changed: 76 additions & 76 deletions

‎CHANGELOG.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ Drupal 7.0, xxxx-xx-xx (development version)
133133
* Added the hook_file_url_alter() hook, which makes it possible to serve
134134
files from a CDN.
135135
* Added a field specifically for uploading files, previously provided by
136-
the contributed module FileField.
136+
the contributed module FileField.
137137
- Image handling:
138138
* Improved image handling, including better support for add-on image
139139
libraries.
140140
* Added API and interface for creating advanced image thumbnails.
141141
* Inclusion of additional effects such as rotate and desaturate.
142142
* Added a field specifically for uploading images, previously provided by
143-
the contributed module ImageField.
143+
the contributed module ImageField.
144144
- Added aliased multi-site support:
145145
* Added support for mapping domain names to sites directories.
146146
- Added RDF support:

‎INSTALL.sqlite.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SQLITE REQUIREMENTS
44
-------------------
55

66
To use SQLite with your Drupal installation, the following requirements must
7-
be met: server has PHP 5.2 or later with PDO, and the PDO SQLite driver must
7+
be met: server has PHP 5.2 or later with PDO, and the PDO SQLite driver must
88
be enabled.
99

1010
SQLITE DATABASE CREATION

‎modules/aggregator/tests/aggregator_test.module‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function aggregator_test_menu() {
1818
/**
1919
* Page callback. Generates a test feed and simulates last-modified and etags.
2020
*
21-
* @param $use_last_modified
21+
* @param $use_last_modified
2222
* Set TRUE to send a last modified header.
2323
* @param $use_etag
2424
* Set TRUE to send an etag.

‎modules/block/block.module‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function block_help($path, $arg) {
3232
case 'admin/structure/block/add':
3333
return '<p>' . t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the <a href="@blocks">blocks administration page</a> to be visible.', array('@blocks' => url('admin/structure/block'))) . '</p>';
3434
}
35-
if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) {
35+
if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) {
3636
$demo_theme = !empty($arg[4]) ? $arg[4] : variable_get('theme_default', 'garland');
3737
$themes = list_themes();
3838
$output = '<p>' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the <em>Save blocks</em> button at the bottom of the page. Click the <em>configure</em> link next to each block to configure its specific title and visibility settings.') . '</p>';
@@ -302,13 +302,13 @@ function _block_get_renderable_array($list = array()) {
302302
* @param $theme
303303
* The theme to rehash blocks for. If not provided, defaults to the currently
304304
* used theme.
305-
*
305+
*
306306
* @return
307307
* Blocks currently exported by modules.
308308
*/
309309
function _block_rehash($theme = NULL) {
310310
global $theme_key;
311-
311+
312312
drupal_theme_initialize();
313313

314314
if (!isset($theme)) {
@@ -843,7 +843,7 @@ function _block_render_blocks($region_blocks) {
843843
*/
844844
function _block_get_cache_id($block) {
845845
global $user;
846-
846+
847847
// User 1 being out of the regular 'roles define permissions' schema,
848848
// it brings too many chances of having unwanted output get in the cache
849849
// and later be served to other users. We therefore exclude user 1 from
@@ -906,7 +906,7 @@ function template_preprocess_block(&$variables) {
906906
/**
907907
* Implement hook_user_role_delete().
908908
*
909-
* Remove deleted role from blocks that use it.
909+
* Remove deleted role from blocks that use it.
910910
*/
911911
function block_user_role_delete($role) {
912912
db_delete('block_role')

‎modules/block/block.test‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,17 @@ class BlockTestCase extends DrupalWebTestCase {
111111
*/
112112
function testBlockVisibility() {
113113
$block = array();
114-
114+
115115
// Create a random title for the block
116116
$title = $this->randomName(8);
117-
117+
118118
// Create the custom block
119119
$custom_block = array();
120120
$custom_block['info'] = $this->randomName(8);
121121
$custom_block['title'] = $title;
122122
$custom_block['body'] = $this->randomName(32);
123123
$this->drupalPost('admin/structure/block/add', $custom_block, t('Save block'));
124-
124+
125125
$bid = db_query("SELECT bid FROM {block_custom} WHERE info = :info", array(':info' => $custom_block['info']))->fetchField();
126126
$block['module'] = 'block';
127127
$block['delta'] = $bid;
@@ -253,7 +253,7 @@ class NewDefaultThemeBlocks extends DrupalWebTestCase {
253253
'group' => 'Block',
254254
);
255255
}
256-
256+
257257
/**
258258
* Check the enabled Garland blocks are correctly copied over.
259259
*/
@@ -297,7 +297,7 @@ class BlockAdminThemeTestCase extends DrupalWebTestCase {
297297
'group' => 'Block',
298298
);
299299
}
300-
300+
301301
/**
302302
* Check for the accessibility of the admin theme on the block admin page.
303303
*/

‎modules/field/modules/field_sql_storage/field_sql_storage.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ class FieldSqlStorageTestCase extends DrupalWebTestCase {
354354
$indexes = $this->getIndexes($table);
355355
$this->assertTrue($indexes["{$field_name}_value"] == array(1 => "{$field_name}_value"), t("Index on value created in $table"));
356356
}
357-
357+
358358
// Add a different index, removing the existing custom one.
359359
$field = array('field_name' => $field_name, 'indexes' => array('value_format' => array('value', 'format')));
360360
field_update_field($field);
@@ -363,14 +363,14 @@ class FieldSqlStorageTestCase extends DrupalWebTestCase {
363363
$this->assertTrue($indexes["{$field_name}_value_format"] == array(1 => "{$field_name}_value", 2 => "{$field_name}_format"), t("Index on value_format created in $table"));
364364
$this->assertTrue(empty($indexes["{$field_name}_value"]), t("Index on value removed in $table"));
365365
}
366-
366+
367367
// Verify that the tables were not dropped.
368368
$entity = field_test_create_stub_entity(0, 0, $instance['bundle']);
369369
field_attach_load('test_entity', array(0 => $entity));
370370
$this->assertEqual($entity->{$field_name}[FIELD_LANGUAGE_NONE][0]['value'], 'field data', t("Index changes performed without dropping the tables"));
371371
}
372372
}
373-
373+
374374
/**
375375
* Test the storage details.
376376
*/

‎modules/field/modules/options/options.module‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function options_buttons_elements_process($element, &$form_state, $form) {
151151
break;
152152
}
153153
}
154-
154+
155155
// If required and there is one option, make it the default.
156156
if ($required && count($options) == 1) {
157157
$keys = array_keys($options);

‎modules/field/modules/options/options.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class OptionsWidgetsTestCase extends DrupalWebTestCase {
7272

7373
/**
7474
* Return an <option> element by value from rendered HTML, or
75-
* '' if it is not found.
75+
* '' if it is not found.
7676
*/
7777
function getOptionByValue($html, $value) {
7878
if (preg_match('@(<option[^>]*value="' . $value . '"[^>]*>[^<]*</option>)@i', $html, $m)) {

‎modules/file/tests/file.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ class FileFieldPathTestCase extends FileFieldTestCase {
534534

535535
/**
536536
* A loose assertion to check that a file is uploaded to the right location.
537-
*
537+
*
538538
* @param $expected_path
539539
* The location where the file is expected to be uploaded. Duplicate file
540540
* names to not need to be taken into account.

‎modules/filter/filter.test‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase {
467467
'group' => 'Filter',
468468
);
469469
}
470-
470+
471471
function testDefaultTextFormats() {
472472
// Create two text formats, and two users. The first user has access to
473473
// both formats, but the second user only has access to the second one.
@@ -1024,11 +1024,11 @@ class FilterUnitTestCase extends DrupalUnitTestCase {
10241024
$f = _filter_htmlcorrector('test <!--this is a comment-->');
10251025
$this->assertEqual($f, 'test <!--this is a comment-->', t('HTML corrector -- Do not touch HTML comments.'));
10261026

1027-
$f = _filter_htmlcorrector('test <!-- comment <p>another
1028-
<strong>multiple</strong> line
1027+
$f = _filter_htmlcorrector('test <!-- comment <p>another
1028+
<strong>multiple</strong> line
10291029
comment</p> -->');
1030-
$this->assertEqual($f, 'test <!-- comment <p>another
1031-
<strong>multiple</strong> line
1030+
$this->assertEqual($f, 'test <!-- comment <p>another
1031+
<strong>multiple</strong> line
10321032
comment</p> -->', t('HTML corrector -- Do not touch HTML comments.'));
10331033

10341034
$f = _filter_htmlcorrector('test <!-- comment <p>another comment</p> -->');

0 commit comments

Comments
 (0)