Commit ea1bd560 authored by webchick's avatar webchick
Browse files

#606526 by axyjo and scor: Remove trailing whitespace and add newlines at end...

#606526 by axyjo and scor: Remove trailing whitespace and add newlines at end of files. Sorry, folks! But it is after code freeze. :)
parent 5f40bd5b
......@@ -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:
......
......@@ -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
......
......@@ -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.
......
......@@ -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')
......
......@@ -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.
*/
......
......@@ -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.
*/
......
......@@ -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);
......
......@@ -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)) {
......
......@@ -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.
......
......@@ -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> -->');
......
......@@ -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);
......
......@@ -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
......
......@@ -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';
......
......@@ -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.'));
}
/**
......
......@@ -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;
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)));
}
......
......@@ -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');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment