summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-10 17:27:54 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-10 17:27:54 +0000
commitea1bd5606ce2da6075fc4344e30e81d074d4eb7c (patch)
tree8f7ec536b62aaed73f026bef53252a05be5474bf
parent5f40bd5becb4deb9663bdacae09b0847d569508a (diff)
downloadbrdo-ea1bd5606ce2da6075fc4344e30e81d074d4eb7c.tar.gz
brdo-ea1bd5606ce2da6075fc4344e30e81d074d4eb7c.tar.bz2
#606526 by axyjo and scor: Remove trailing whitespace and add newlines at end of files. Sorry, folks! But it is after code freeze. :)
-rw-r--r--CHANGELOG.txt4
-rw-r--r--INSTALL.sqlite.txt2
-rw-r--r--modules/aggregator/tests/aggregator_test.module2
-rw-r--r--modules/block/block.module10
-rw-r--r--modules/block/block.test10
-rw-r--r--modules/field/modules/field_sql_storage/field_sql_storage.test6
-rw-r--r--modules/field/modules/options/options.module2
-rw-r--r--modules/field/modules/options/options.test2
-rw-r--r--modules/file/tests/file.test2
-rw-r--r--modules/filter/filter.test10
-rw-r--r--modules/image/image.test2
-rw-r--r--modules/locale/locale.module2
-rw-r--r--modules/locale/locale.test6
-rw-r--r--modules/menu/menu.test2
-rw-r--r--modules/openid/openid.css2
-rw-r--r--modules/simpletest/files/css_test_files/css_input_without_import.css2
-rw-r--r--modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css2
-rw-r--r--modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css2
-rw-r--r--modules/simpletest/tests/actions.test2
-rw-r--r--modules/simpletest/tests/bootstrap.test4
-rw-r--r--modules/simpletest/tests/database_test.module4
-rw-r--r--modules/simpletest/tests/file.test2
-rw-r--r--modules/simpletest/tests/filetransfer.test4
-rw-r--r--modules/simpletest/tests/form_test.module2
-rw-r--r--modules/simpletest/tests/menu_test.module4
-rw-r--r--modules/simpletest/tests/system_test.module2
-rw-r--r--modules/syslog/syslog.test2
-rw-r--r--modules/toolbar/toolbar.css2
-rw-r--r--modules/toolbar/toolbar.install2
-rw-r--r--modules/toolbar/toolbar.module4
-rw-r--r--modules/update/update.install2
-rw-r--r--modules/user/user.test28
-rw-r--r--profiles/default/default.info2
-rw-r--r--profiles/default/default.install2
-rw-r--r--profiles/expert/expert.install2
-rwxr-xr-xscripts/run-tests.sh2
-rw-r--r--themes/seven/reset.css10
37 files changed, 76 insertions, 76 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ba7aceb78..227c1e729 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -133,14 +133,14 @@ Drupal 7.0, xxxx-xx-xx (development version)
* Added the hook_file_url_alter() hook, which makes it possible to serve
files from a CDN.
* Added a field specifically for uploading files, previously provided by
- the contributed module FileField.
+ the contributed module FileField.
- Image handling:
* Improved image handling, including better support for add-on image
libraries.
* Added API and interface for creating advanced image thumbnails.
* Inclusion of additional effects such as rotate and desaturate.
* Added a field specifically for uploading images, previously provided by
- the contributed module ImageField.
+ the contributed module ImageField.
- Added aliased multi-site support:
* Added support for mapping domain names to sites directories.
- Added RDF support:
diff --git a/INSTALL.sqlite.txt b/INSTALL.sqlite.txt
index cc0c9a496..549738788 100644
--- a/INSTALL.sqlite.txt
+++ b/INSTALL.sqlite.txt
@@ -4,7 +4,7 @@ SQLITE REQUIREMENTS
-------------------
To use SQLite with your Drupal installation, the following requirements must
-be met: server has PHP 5.2 or later with PDO, and the PDO SQLite driver must
+be met: server has PHP 5.2 or later with PDO, and the PDO SQLite driver must
be enabled.
SQLITE DATABASE CREATION
diff --git a/modules/aggregator/tests/aggregator_test.module b/modules/aggregator/tests/aggregator_test.module
index a13c47208..98e589472 100644
--- a/modules/aggregator/tests/aggregator_test.module
+++ b/modules/aggregator/tests/aggregator_test.module
@@ -18,7 +18,7 @@ function aggregator_test_menu() {
/**
* Page callback. Generates a test feed and simulates last-modified and etags.
*
- * @param $use_last_modified
+ * @param $use_last_modified
* Set TRUE to send a last modified header.
* @param $use_etag
* Set TRUE to send an etag.
diff --git a/modules/block/block.module b/modules/block/block.module
index 4a502d7e2..4dd9e4855 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -32,7 +32,7 @@ function block_help($path, $arg) {
case 'admin/structure/block/add':
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>';
}
- if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) {
+ if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) {
$demo_theme = !empty($arg[4]) ? $arg[4] : variable_get('theme_default', 'garland');
$themes = list_themes();
$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()) {
* @param $theme
* The theme to rehash blocks for. If not provided, defaults to the currently
* used theme.
- *
+ *
* @return
* Blocks currently exported by modules.
*/
function _block_rehash($theme = NULL) {
global $theme_key;
-
+
drupal_theme_initialize();
if (!isset($theme)) {
@@ -843,7 +843,7 @@ function _block_render_blocks($region_blocks) {
*/
function _block_get_cache_id($block) {
global $user;
-
+
// User 1 being out of the regular 'roles define permissions' schema,
// it brings too many chances of having unwanted output get in the cache
// and later be served to other users. We therefore exclude user 1 from
@@ -906,7 +906,7 @@ function template_preprocess_block(&$variables) {
/**
* Implement hook_user_role_delete().
*
- * Remove deleted role from blocks that use it.
+ * Remove deleted role from blocks that use it.
*/
function block_user_role_delete($role) {
db_delete('block_role')
diff --git a/modules/block/block.test b/modules/block/block.test
index 3b67f4b92..544191915 100644
--- a/modules/block/block.test
+++ b/modules/block/block.test
@@ -111,17 +111,17 @@ class BlockTestCase extends DrupalWebTestCase {
*/
function testBlockVisibility() {
$block = array();
-
+
// Create a random title for the block
$title = $this->randomName(8);
-
+
// Create the custom block
$custom_block = array();
$custom_block['info'] = $this->randomName(8);
$custom_block['title'] = $title;
$custom_block['body'] = $this->randomName(32);
$this->drupalPost('admin/structure/block/add', $custom_block, t('Save block'));
-
+
$bid = db_query("SELECT bid FROM {block_custom} WHERE info = :info", array(':info' => $custom_block['info']))->fetchField();
$block['module'] = 'block';
$block['delta'] = $bid;
@@ -253,7 +253,7 @@ class NewDefaultThemeBlocks extends DrupalWebTestCase {
'group' => 'Block',
);
}
-
+
/**
* Check the enabled Garland blocks are correctly copied over.
*/
@@ -297,7 +297,7 @@ class BlockAdminThemeTestCase extends DrupalWebTestCase {
'group' => 'Block',
);
}
-
+
/**
* Check for the accessibility of the admin theme on the block admin page.
*/
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.test b/modules/field/modules/field_sql_storage/field_sql_storage.test
index 221c2e191..2a64c55da 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.test
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.test
@@ -354,7 +354,7 @@ class FieldSqlStorageTestCase extends DrupalWebTestCase {
$indexes = $this->getIndexes($table);
$this->assertTrue($indexes["{$field_name}_value"] == array(1 => "{$field_name}_value"), t("Index on value created in $table"));
}
-
+
// Add a different index, removing the existing custom one.
$field = array('field_name' => $field_name, 'indexes' => array('value_format' => array('value', 'format')));
field_update_field($field);
@@ -363,14 +363,14 @@ class FieldSqlStorageTestCase extends DrupalWebTestCase {
$this->assertTrue($indexes["{$field_name}_value_format"] == array(1 => "{$field_name}_value", 2 => "{$field_name}_format"), t("Index on value_format created in $table"));
$this->assertTrue(empty($indexes["{$field_name}_value"]), t("Index on value removed in $table"));
}
-
+
// Verify that the tables were not dropped.
$entity = field_test_create_stub_entity(0, 0, $instance['bundle']);
field_attach_load('test_entity', array(0 => $entity));
$this->assertEqual($entity->{$field_name}[FIELD_LANGUAGE_NONE][0]['value'], 'field data', t("Index changes performed without dropping the tables"));
}
}
-
+
/**
* Test the storage details.
*/
diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module
index 22083fd3c..22099fd9e 100644
--- a/modules/field/modules/options/options.module
+++ b/modules/field/modules/options/options.module
@@ -151,7 +151,7 @@ function options_buttons_elements_process($element, &$form_state, $form) {
break;
}
}
-
+
// If required and there is one option, make it the default.
if ($required && count($options) == 1) {
$keys = array_keys($options);
diff --git a/modules/field/modules/options/options.test b/modules/field/modules/options/options.test
index 101b3befe..c81b86632 100644
--- a/modules/field/modules/options/options.test
+++ b/modules/field/modules/options/options.test
@@ -72,7 +72,7 @@ class OptionsWidgetsTestCase extends DrupalWebTestCase {
/**
* Return an <option> element by value from rendered HTML, or
- * '' if it is not found.
+ * '' if it is not found.
*/
function getOptionByValue($html, $value) {
if (preg_match('@(<option[^>]*value="' . $value . '"[^>]*>[^<]*</option>)@i', $html, $m)) {
diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test
index 8c4a75b0a..d3444a585 100644
--- a/modules/file/tests/file.test
+++ b/modules/file/tests/file.test
@@ -534,7 +534,7 @@ class FileFieldPathTestCase extends FileFieldTestCase {
/**
* A loose assertion to check that a file is uploaded to the right location.
- *
+ *
* @param $expected_path
* The location where the file is expected to be uploaded. Duplicate file
* names to not need to be taken into account.
diff --git a/modules/filter/filter.test b/modules/filter/filter.test
index 9b723e52b..24908c99d 100644
--- a/modules/filter/filter.test
+++ b/modules/filter/filter.test
@@ -467,7 +467,7 @@ class FilterDefaultFormatTestCase extends DrupalWebTestCase {
'group' => 'Filter',
);
}
-
+
function testDefaultTextFormats() {
// Create two text formats, and two users. The first user has access to
// both formats, but the second user only has access to the second one.
@@ -1024,11 +1024,11 @@ class FilterUnitTestCase extends DrupalUnitTestCase {
$f = _filter_htmlcorrector('test <!--this is a comment-->');
$this->assertEqual($f, 'test <!--this is a comment-->', t('HTML corrector -- Do not touch HTML comments.'));
- $f = _filter_htmlcorrector('test <!-- comment <p>another
- <strong>multiple</strong> line
+ $f = _filter_htmlcorrector('test <!-- comment <p>another
+ <strong>multiple</strong> line
comment</p> -->');
- $this->assertEqual($f, 'test <!-- comment <p>another
- <strong>multiple</strong> line
+ $this->assertEqual($f, 'test <!-- comment <p>another
+ <strong>multiple</strong> line
comment</p> -->', t('HTML corrector -- Do not touch HTML comments.'));
$f = _filter_htmlcorrector('test <!-- comment <p>another comment</p> -->');
diff --git a/modules/image/image.test b/modules/image/image.test
index 1c8e1a5b0..ccac5d5ec 100644
--- a/modules/image/image.test
+++ b/modules/image/image.test
@@ -82,7 +82,7 @@ class ImageStylesPathAndUrlUnitTest extends DrupalWebTestCase {
*/
function _testImageStyleUrlAndPath($scheme) {
// Make the default scheme neither "public" nor "private" to verify the
- // functions work for other than the default scheme.
+ // functions work for other than the default scheme.
variable_set('file_default_scheme', 'temporary');
file_prepare_directory($d = 'temporary://', FILE_CREATE_DIRECTORY);
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index e35fe9ca9..709c1528c 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -468,7 +468,7 @@ function locale_theme() {
*/
function locale_field_attach_view_alter(&$output, $context) {
// In locale_field_fallback_view() we might call field_attach_view(). The
- // static variable avoids unnecessary recursion.
+ // static variable avoids unnecessary recursion.
static $recursion;
// Do not apply fallback rules if disabled or if Locale is not registered as a
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 15cdf6d9d..7a4112860 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -1690,7 +1690,7 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase {
$assert = isset($node->body['it']) && !isset($node->body['en']) && $node->body['it'][0]['value'] == $body_value;
$this->assertTrue($assert, t('Field language correctly changed.'));
}
-
+
/*
* Test multilingual field display settings.
*/
@@ -1708,11 +1708,11 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase {
$edit[$body_key] = $body_value;
$edit['language'] = 'en';
$this->drupalPost('node/add/page', $edit, t('Save'));
-
+
// Check that the node exists in the database.
$node = $this->drupalGetNodeByTitle($edit[$title_key]);
$this->assertTrue($node, t('Node found in database.'));
-
+
// Check if node body is showed.
$this->drupalGet("node/$node->nid");
$body_xpath = '//div[@id="node-' . $node->nid . '"]//div[@property="content:encoded"]/p';
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index 9eab7ee13..fbd3fe74f 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -181,7 +181,7 @@ class MenuTestCase extends DrupalWebTestCase {
$this->assertFalse(menu_load($menu_name), 'Custom menu was deleted');
// Test if all menu links associated to the menu were removed from database.
$result = db_query("SELECT menu_name FROM {menu_links} WHERE menu_name = :menu_name", array(':menu_name' => $menu_name))->fetchField();
- $this->assertFalse($result, t('All menu links associated to the custom menu were deleted.'));
+ $this->assertFalse($result, t('All menu links associated to the custom menu were deleted.'));
}
/**
diff --git a/modules/openid/openid.css b/modules/openid/openid.css
index 5d694a393..c752cc260 100644
--- a/modules/openid/openid.css
+++ b/modules/openid/openid.css
@@ -33,7 +33,7 @@ html.js #user-login li.openid-link {
#user-login li.user-link {
display: none;
}
-#user-login-form li.openid-link a,
+#user-login-form li.openid-link a,
#user-login li.openid-link a {
background: transparent url("login-bg.png") no-repeat 0 2px;
padding: 0 20px;
diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css b/modules/simpletest/files/css_test_files/css_input_without_import.css
index 70ad5a66e..89e2df24c 100644
--- a/modules/simpletest/files/css_test_files/css_input_without_import.css
+++ b/modules/simpletest/files/css_test_files/css_input_without_import.css
@@ -22,7 +22,7 @@ body {
* CSS spec says that all whitespace is valid whitespace, so this selector should be just as
* good as the one above.
*/
-
+
.this
.is
.a
diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css b/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css
index bf139f490..e5920f094 100644
--- a/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css
+++ b/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css
@@ -4,7 +4,7 @@
body{margin:0;padding:0;background:#edf5fa;font:76%/170% Verdana,sans-serif;color:#494949;}.this .is .a .test{font:1em/100% Verdana,sans-serif;color:#494949;}
-
+
.this
.is
.a
diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css b/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css
index 70ad5a66e..89e2df24c 100644
--- a/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css
+++ b/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css
@@ -22,7 +22,7 @@ body {
* CSS spec says that all whitespace is valid whitespace, so this selector should be just as
* good as the one above.
*/
-
+
.this
.is
.a
diff --git a/modules/simpletest/tests/actions.test b/modules/simpletest/tests/actions.test
index 7cc06b558..2f43b8777 100644
--- a/modules/simpletest/tests/actions.test
+++ b/modules/simpletest/tests/actions.test
@@ -118,7 +118,7 @@ class ActionLoopTestCase extends DrupalWebTestCase {
$result = db_query("SELECT * FROM {watchdog} WHERE type = 'actions_loop_test' OR type = 'actions' ORDER BY timestamp");
$loop_started = FALSE;
foreach ($result as $row) {
-
+
$expected_message = array_shift($expected);
$this->assertEqual($row->message, $expected_message, t('Expected message %expected, got %message.', array('%expected' => $expected_message, '%message' => $row->message)));
}
diff --git a/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test
index cac805897..18d671b39 100644
--- a/modules/simpletest/tests/bootstrap.test
+++ b/modules/simpletest/tests/bootstrap.test
@@ -180,7 +180,7 @@ class BootstrapPageCacheTestCase extends DrupalWebTestCase {
/**
* Test page compression.
- *
+ *
* The test should pass even if zlib.output_compression is enabled in php.ini,
* .htaccess or similar, or if compression is done outside PHP, e.g. by the
* mod_deflate Apache module.
@@ -356,7 +356,7 @@ class BootstrapTimerTestCase extends DrupalUnitTestCase {
/**
* Test timer_read() to ensure it properly accumulates time when the timer
* started and stopped multiple times.
- * @return
+ * @return
*/
function testTimer() {
timer_start('test');
diff --git a/modules/simpletest/tests/database_test.module b/modules/simpletest/tests/database_test.module
index 422f097fc..4a6a95c07 100644
--- a/modules/simpletest/tests/database_test.module
+++ b/modules/simpletest/tests/database_test.module
@@ -149,7 +149,7 @@ function database_test_tablesort() {
$query = db_select('test_task', 't');
$query
->fields('t', array('tid', 'pid', 'task', 'priority'));
-
+
$query = $query->extend('TableSort')->orderByHeader($header);
// We need all the results at once to check the sort.
@@ -178,7 +178,7 @@ function database_test_tablesort_first() {
$query = db_select('test_task', 't');
$query
->fields('t', array('tid', 'pid', 'task', 'priority'));
-
+
$query = $query->extend('TableSort')->orderByHeader($header)->orderBy('priority');
// We need all the results at once to check the sort.
diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test
index b7ec982ab..46c24508b 100644
--- a/modules/simpletest/tests/file.test
+++ b/modules/simpletest/tests/file.test
@@ -1892,7 +1892,7 @@ class FileDownloadTest extends FileTestCase {
$this->assertEqual($GLOBALS['base_url'] . '/' . file_directory_path() . '/' . $file->filename, $url, t('Correctly generated a URL for a created file.'));
$this->drupalHead($url);
$this->assertResponse(200, t('Confirmed that the generated URL is correct by downloading the created file.'));
-
+
// Test generating an URL to a shipped file (i.e. a file that is part of
// Drupal core, a module or a theme, for example a JavaScript file).
$filepath = 'misc/jquery.js';
diff --git a/modules/simpletest/tests/filetransfer.test b/modules/simpletest/tests/filetransfer.test
index cefd90e10..03e966d03 100644
--- a/modules/simpletest/tests/filetransfer.test
+++ b/modules/simpletest/tests/filetransfer.test
@@ -97,7 +97,7 @@ class TestFileTransfer extends FileTransfer {
protected $username = NULL;
protected $password = NULL;
protected $port = NULL;
-
+
/**
* This is for testing the CopyRecursive logic.
*/
@@ -135,7 +135,7 @@ class TestFileTransfer extends FileTransfer {
throw new FileTransferException('Unable to remove to file @file.', NULL, array('@file' => $item));
}
}
-
+
function isDirectory($path) {
return $this->shouldIsDirectoryReturnTrue;
}
diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module
index af4dbccde..ffc777c42 100644
--- a/modules/simpletest/tests/form_test.module
+++ b/modules/simpletest/tests/form_test.module
@@ -211,7 +211,7 @@ function _form_test_tableselect_js_select_form($form, $form_state, $action) {
* drupal_form_submit using the values specified in this function.
*
* The form's field test_value begins at 'initial_value', and is changed
- * to 'form_submitted' when the form is submitted successfully. On
+ * to 'form_submitted' when the form is submitted successfully. On
* completion this function is passed 'done' to complete the process.
*/
function form_test_drupal_form_submit_batch_api($arg = '') {
diff --git a/modules/simpletest/tests/menu_test.module b/modules/simpletest/tests/menu_test.module
index ae8235a9f..df1c49781 100644
--- a/modules/simpletest/tests/menu_test.module
+++ b/modules/simpletest/tests/menu_test.module
@@ -125,9 +125,9 @@ function menu_test_theme_callback($argument) {
* Helper function for the testMenuName() test. Used to change the menu_name
* parameter of a menu.
*
- * @param $new_name
+ * @param $new_name
* If set, will change the menu_name value.
- * @return
+ * @return
* The menu_name value to use.
*/
function menu_test_menu_name($new_name = '') {
diff --git a/modules/simpletest/tests/system_test.module b/modules/simpletest/tests/system_test.module
index 670305536..53080a86b 100644
--- a/modules/simpletest/tests/system_test.module
+++ b/modules/simpletest/tests/system_test.module
@@ -9,7 +9,7 @@ function system_test_menu() {
'page callback' => 'system_test_batch_theme',
'access callback' => TRUE,
'type' => MENU_CALLBACK,
- );
+ );
$items['system-test/sleep/%'] = array(
'page callback' => 'system_test_sleep',
'page arguments' => array(2),
diff --git a/modules/syslog/syslog.test b/modules/syslog/syslog.test
index 0efd7e3ed..6a0dbafd0 100644
--- a/modules/syslog/syslog.test
+++ b/modules/syslog/syslog.test
@@ -26,7 +26,7 @@ class SyslogTestCase extends DrupalWebTestCase {
if (defined('LOG_LOCAL6')) {
$this->drupalPost('admin/config/development/logging', array('syslog_facility' => LOG_LOCAL6), t('Save configuration'));
$this->assertText(t('The configuration options have been saved.'));
-
+
$this->drupalGet('admin/config/development/logging');
if ($this->parse()) {
$field = $this->xpath('//option[@value="' . LOG_LOCAL6 . '"]'); // Should be one field.
diff --git a/modules/toolbar/toolbar.css b/modules/toolbar/toolbar.css
index da69570b9..c20fcd545 100644
--- a/modules/toolbar/toolbar.css
+++ b/modules/toolbar/toolbar.css
@@ -41,7 +41,7 @@ div#toolbar {
div#toolbar .collapsed {
display: none;
-}
+}
div#toolbar div.shadow {
position: absolute;
diff --git a/modules/toolbar/toolbar.install b/modules/toolbar/toolbar.install
index d0de14381..3dcc4f5e7 100644
--- a/modules/toolbar/toolbar.install
+++ b/modules/toolbar/toolbar.install
@@ -10,7 +10,7 @@
* Implementation of hook_install().
*
* @todo
- * Implement role based shortcut bars.
+ * Implement role based shortcut bars.
*/
function toolbar_install() {
$t = get_t();
diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module
index 55f89df12..0c050c8a1 100644
--- a/modules/toolbar/toolbar.module
+++ b/modules/toolbar/toolbar.module
@@ -32,7 +32,7 @@ function toolbar_theme($existing, $type, $theme, $path) {
/**
* Implement hook_page_build().
- *
+ *
* Add admin toolbar to the page_top region automatically.
*/
function toolbar_page_build(&$page) {
@@ -180,7 +180,7 @@ function toolbar_menu_navigation_links($tree) {
/**
* Checks whether an item is in the active trail.
*
- * Useful when using a menu generated by menu_tree_all_data() which does
+ * Useful when using a menu generated by menu_tree_all_data() which does
* not set the 'in_active_trail' flag on items.
*
* @todo
diff --git a/modules/update/update.install b/modules/update/update.install
index 7087cf65b..66db2278b 100644
--- a/modules/update/update.install
+++ b/modules/update/update.install
@@ -46,7 +46,7 @@ function update_schema() {
}
/**
- * Create a queue to store tasks for requests to fetch available update data.
+ * Create a queue to store tasks for requests to fetch available update data.
*/
function update_update_7000() {
module_load_include('inc', 'system', 'system.queue');
diff --git a/modules/user/user.test b/modules/user/user.test
index 67d885722..ec24035a8 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -9,16 +9,16 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
'group' => 'User'
);
}
-
+
function testRegistrationWithEmailVerification() {
// Require e-mail verification.
variable_set('user_email_verification', TRUE);
-
+
// Set registration to administrator only.
variable_set('user_register', 0);
$this->drupalGet('user/register');
$this->assertResponse(403, t('Registration page is inaccessible when only administrators can create accounts.'));
-
+
// Allow registration by site visitors without administrator approval.
variable_set('user_register', 1);
$edit = array();
@@ -28,7 +28,7 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
$this->assertText(t('Your password and further instructions have been sent to your e-mail address.'), t('User registered successfully.'));
$new_user = reset(user_load_multiple(array(), array('name' => $name, 'mail' => $mail)));
$this->assertTrue($new_user->status, t('New account is active after registration.'));
-
+
// Allow registration by site visitors, but require administrator approval.
variable_set('user_register', 2);
$edit = array();
@@ -38,17 +38,17 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
$new_user = reset(user_load_multiple(array(), array('name' => $name, 'mail' => $mail)));
$this->assertFalse($new_user->status, t('New account is blocked until approved by an administrator.'));
}
-
+
function testRegistrationWithoutEmailVerification() {
// Don't require e-mail verification.
variable_set('user_email_verification', FALSE);
-
+
// Allow registration by site visitors without administrator approval.
variable_set('user_register', 1);
$edit = array();
$edit['name'] = $name = $this->randomName();
$edit['mail'] = $mail = $edit['name'] . '@example.com';
-
+
// Try entering a mismatching password.
$edit['pass[pass1]'] = '99999.0';
$edit['pass[pass2]'] = '99999';
@@ -62,7 +62,7 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
$new_user = reset(user_load_multiple(array(), array('name' => $name, 'mail' => $mail)));
$this->assertText(t('Registration successful. You are now logged in.'), t('Users are logged in after registering.'));
$this->drupalLogout();
-
+
// Allow registration by site visitors, but require administrator approval.
variable_set('user_register', 2);
$edit = array();
@@ -72,7 +72,7 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
$edit['pass[pass2]'] = $pass;
$this->drupalPost('user/register', $edit, t('Create new account'));
$this->assertText(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.'), t('Users are notified of pending approval'));
-
+
// Try to login before administrator approval.
$auth = array(
'name' => $name,
@@ -90,7 +90,7 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
);
$this->drupalPost('user/' . $new_user->uid . '/edit', $edit, t('Save'));
$this->drupalLogout();
-
+
// Login after administrator approval.
$this->drupalPost('user/login', $auth, t('Log in'));
$this->assertText(t('Member for'), t('User can log in after administrator approval.'));
@@ -99,21 +99,21 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
function testRegistrationDefaultValues() {
// Allow registration by site visitors without administrator approval.
variable_set('user_register', 1);
-
+
// Don't require e-mail verification.
variable_set('user_email_verification', FALSE);
-
+
// Set the default timezone to Brussels.
variable_set('configurable_timezones', 1);
variable_set('date_default_timezone', 'Europe/Brussels');
-
+
$edit = array();
$edit['name'] = $name = $this->randomName();
$edit['mail'] = $mail = $edit['name'] . '@example.com';
$edit['pass[pass1]'] = $new_pass = $this->randomName();
$edit['pass[pass2]'] = $new_pass;
$this->drupalPost('user/register', $edit, t('Create new account'));
-
+
// Check user fields.
$new_user = reset(user_load_multiple(array(), array('name' => $name, 'mail' => $mail)));
$this->assertEqual($new_user->name, $name, t('Username matches.'));
diff --git a/profiles/default/default.info b/profiles/default/default.info
index ccec0c991..100a6e1dc 100644
--- a/profiles/default/default.info
+++ b/profiles/default/default.info
@@ -8,7 +8,7 @@ dependencies[] = color
dependencies[] = comment
dependencies[] = dashboard
dependencies[] = help
-dependencies[] = image
+dependencies[] = image
dependencies[] = menu
dependencies[] = path
dependencies[] = taxonomy
diff --git a/profiles/default/default.install b/profiles/default/default.install
index 8b5267c16..05b54936b 100644
--- a/profiles/default/default.install
+++ b/profiles/default/default.install
@@ -209,7 +209,7 @@ function default_install() {
'machine_name' => 'tags',
'help' => $help,
- );
+ );
taxonomy_vocabulary_save($vocabulary);
$instance = array(
'field_name' => 'taxonomy_' . $vocabulary->machine_name,
diff --git a/profiles/expert/expert.install b/profiles/expert/expert.install
index f3a48387c..6682016dc 100644
--- a/profiles/expert/expert.install
+++ b/profiles/expert/expert.install
@@ -65,7 +65,7 @@ function expert_install() {
foreach ($values as $record) {
$query->values($record);
}
- $query->execute();
+ $query->execute();
// Enable default permissions for system roles.
user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access content', 'use text format 1'));
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index 54f47bc53..7dc16e4b6 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -141,7 +141,7 @@ All arguments are long options.
<test1>[,<test2>[,<test3> ...]]
One or more tests to be run. By default, these are interpreted
- as the names of test groups as shown at
+ as the names of test groups as shown at
?q=admin/config/development/testing.
These group names typically correspond to module names like "User"
or "Profile" or "System", but there is also a group "XML-RPC".
diff --git a/themes/seven/reset.css b/themes/seven/reset.css
index 36e4d6bd4..a2d42911e 100644
--- a/themes/seven/reset.css
+++ b/themes/seven/reset.css
@@ -1,7 +1,7 @@
/* $Id$ */
/**
- * Reset CSS styles.
+ * Reset CSS styles.
*
* Based on Eric Meyer's "Reset CSS 1.0" tool from
* http://meyerweb.com/eric/tools/css/reset
@@ -184,8 +184,8 @@ q:before, q:after {
}
/* Remember to highlight inserts somehow! */
-ins {
- text-decoration: none;
+ins {
+ text-decoration: none;
}
del {
text-decoration: line-through;
@@ -206,8 +206,8 @@ table {
input,
select,
textarea,
-body {
- font: 13px/20px "Helvetica Neue", Helvetica, Arial, sans-serif;
+body {
+ font: 13px/20px "Helvetica Neue", Helvetica, Arial, sans-serif;
}
/**