>
-
+
-
+
subject): ?>
>subject ?>
diff --git modules/book/book-all-books-block.tpl.php modules/book/book-all-books-block.tpl.php
index c0bea14..3ef3e76 100644
--- modules/book/book-all-books-block.tpl.php
+++ modules/book/book-all-books-block.tpl.php
@@ -9,7 +9,7 @@
*
* Available variables:
* - $book_menus: Array of book outlines keyed to the parent book ID. Call
- * render() on each to print it as an unordered list.
+ * render() on each to print it as an unordered list.
*/
?>
$menu) : ?>
diff --git modules/color/color.module modules/color/color.module
index 3aaa37c..72e0355 100644
--- modules/color/color.module
+++ modules/color/color.module
@@ -11,7 +11,7 @@ function color_help($path, $arg) {
$output .= '' . t('The Color module allows users with the Administer site configuration permission to quickly and easily change the color scheme of themes that have been built to be compatible with it. For more information, see the online handbook entry for Color module.', array('@color' => 'http://drupal.org/handbook/modules/color')) . '
';
$output .= '' . t('Uses') . '
';
$output .= '';
- $output .= '- ' . t('Changing colors') . '
';
+ $output .= '- ' . t('Changing colors') . '
';
$output .= '- ' . t("Using the Color module allows you to easily change the color of links, backgrounds, text, and other theme elements. To change the color settings for a compatible theme, select the configure link for your theme on the Themes administration page. If you don't see a color picker on that page, then your theme is not compatible with the color module. If you are sure that the theme does indeed support the color module, but the color picker does not appear, then follow these troubleshooting procedures.", array('@configure' => url('admin/appearance'), '@troubleshoot' => 'http://drupal.org/node/109457')) . '
';
$output .= '- ' . t("The Color module saves a modified copy of the theme's specified stylesheets in the files directory. This means that if you make any manual changes to your theme's stylesheet, you must save your color settings again, even if they haven't changed. This step is required because the module stylesheets (in the files directory) need to be recreated to include your changes.") . '
';
$output .= '
';
diff --git modules/comment/comment.module modules/comment/comment.module
index 932c77e..c7873f7 100644
--- modules/comment/comment.module
+++ modules/comment/comment.module
@@ -1393,7 +1393,7 @@ function comment_save($comment) {
catch (Exception $e) {
$transaction->rollback('comment', $e->getMessage(), array(), WATCHDOG_ERROR);
}
-
+
}
/**
diff --git modules/field/modules/list/list.test modules/field/modules/list/list.test
index c14d74a..27e462f 100644
--- modules/field/modules/list/list.test
+++ modules/field/modules/list/list.test
@@ -85,7 +85,7 @@ class ListFieldTestCase extends DrupalWebTestCase {
$this->assertTrue(!empty($form['card_1'][LANGUAGE_NONE][2]), t('Option 2 exists'));
$this->assertTrue(!empty($form['card_1'][LANGUAGE_NONE][3]), t('Option 3 exists'));
}
-
+
}
/**
@@ -99,24 +99,24 @@ class ListFieldUITestCase extends DrupalWebTestCase {
'group' => 'Field types',
);
}
-
+
function setUp() {
FieldUITestCase::setUp();
}
-
+
/**
* Tests that allowed values are properly validated in the UI.
*/
function testAllowedValues() {
$element_name = "field[settings][allowed_values]";
-
+
//Test 'List' field type.
$admin_path = $this->createListFieldAndEdit('list');
//Check that non-integer keys are rejected.
$edit = array($element_name => "1.1|one\n");
$this->drupalPost($admin_path, $edit, t('Save settings'));
$this->assertText("keys must be integers", t('Form vaildation failed.'));
-
+
// Test 'List (number)' field type.
$admin_path = $this->createListFieldAndEdit('list_number');
//Check that non-numeric keys are rejected.
@@ -130,23 +130,23 @@ class ListFieldUITestCase extends DrupalWebTestCase {
$edit = array($element_name => "1|one\n" . $this->randomName(255) . "|two");
$this->drupalPost($admin_path, $edit, t('Save settings'));
$this->assertText("each key must be a string less than 255 characters", t('Form vaildation failed.'));
-
+
// Test 'List (boolean)' field type.
- $admin_path = $this->createListFieldAndEdit('list_boolean');
+ $admin_path = $this->createListFieldAndEdit('list_boolean');
// Check that invalid option keys are rejected.
$edit = array($element_name => "1|one\n2|two");
$this->drupalPost($admin_path, $edit, t('Save settings'));
$this->assertText("keys must be either 0 or 1", t('Form vaildation failed.'));
-
+
//Check that missing option causes failure.
$edit = array($element_name => "1|one");
$this->drupalPost($admin_path, $edit, t('Save settings'));
- $this->assertText("two values are required", t('Form vaildation failed.'));
+ $this->assertText("two values are required", t('Form vaildation failed.'));
}
-
+
/**
* Helper function to create list field of a given type and get the edit page.
- *
+ *
* @param string $type
* 'list', 'list_boolean', 'list_number', or 'list_text'
*/
@@ -168,6 +168,6 @@ class ListFieldUITestCase extends DrupalWebTestCase {
$admin_path = 'admin/structure/types/manage/' . $this->hyphen_type . '/fields/' . $field_name;
return $admin_path;
}
-
+
}
diff --git modules/help/help.api.php modules/help/help.api.php
index 1fd0e38..ae15b70 100644
--- modules/help/help.api.php
+++ modules/help/help.api.php
@@ -26,7 +26,7 @@
* is being requested; e.g., 'admin/node' or 'user/edit'. If the router path
* includes a % wildcard, then this will appear in $path; for example,
* node pages would have $path equal to 'node/%' or 'node/%/view'. Your hook
- * implementation may also be called with special descriptors after a
+ * implementation may also be called with special descriptors after a
* "#" sign. Some examples:
* - admin/help#modulename
* The main module help text, displayed on the admin/help/modulename
@@ -41,7 +41,7 @@
* array should always be used rather than directly invoking arg(), because
* your hook implementation may be called for other purposes besides building
* the current page's help. Note that depending on which module is invoking
- * hook_help, $arg may contain only empty strings. Regardless, $arg[0] to
+ * hook_help, $arg may contain only empty strings. Regardless, $arg[0] to
* $arg[11] will always be set.
* @return
* A localized string containing the help text.
diff --git modules/menu/menu.api.php modules/menu/menu.api.php
index 1f975f2..b3eb652 100644
--- modules/menu/menu.api.php
+++ modules/menu/menu.api.php
@@ -163,7 +163,7 @@
* instead.
* - "page arguments": An array of arguments to pass to the page callback
* function, with path component substitution as described above.
- * - "delivery callback": The function to call to package the result of the
+ * - "delivery callback": The function to call to package the result of the
* page callback function and send it to the browser. Defaults to
* drupal_deliver_html_page() unless a value is inherited from a parent menu
* item.
diff --git modules/node/node.module modules/node/node.module
index d13131c..859dfcf 100644
--- modules/node/node.module
+++ modules/node/node.module
@@ -95,7 +95,7 @@ function node_help($path, $arg) {
$output .= '' . t('The Node module also enables you to create multiple versions of any content, and revert to older versions using the Revision information settings.') . '';
$output .= '' . t('User permissions') . '';
$output .= '' . t('The Node module makes a number of permissions available for each content type, which can be set by role on the permissions page.', array('@permissions' => url('admin/settings/permissions'))) . '';
- $output .= '';
+ $output .= '';
return $output;
case 'admin/content':
@@ -997,7 +997,7 @@ function node_save($node) {
}
// The changed timestamp is always updated for bookkeeping purposes (revisions, searching, ...)
$node->changed = REQUEST_TIME;
-
+
$node->timestamp = REQUEST_TIME;
$update_node = TRUE;
@@ -1032,30 +1032,30 @@ function node_save($node) {
->condition('nid', $node->nid)
->execute();
}
-
+
// Restore the title field data structure after db storage.
$node->title = $title_field;
-
+
// Call the node specific callback (if any). This can be
// node_invoke($node, 'insert') or
// node_invoke($node, 'update').
node_invoke($node, $op);
-
+
// Save fields.
$function = "field_attach_$op";
$function('node', $node);
-
+
module_invoke_all('node_' . $op, $node);
-
+
// Update the node access table for this node.
node_access_acquire_grants($node);
-
+
// Clear internal properties.
unset($node->is_new);
-
+
// Clear the page and block caches.
cache_clear_all();
-
+
// Ignore slave server temporarily to give time for the
// saved node to be propagated to the slave.
db_ignore_slave();
diff --git modules/node/node.pages.inc modules/node/node.pages.inc
index ae7b630..b7af72c 100644
--- modules/node/node.pages.inc
+++ modules/node/node.pages.inc
@@ -535,7 +535,7 @@ function node_revision_overview($node) {
}
$rows[] = array_merge($row, $operations);
}
-
+
$build['node_revisions_table'] = array(
'#theme' => 'table',
'#rows' => $rows,
diff --git modules/node/node.test modules/node/node.test
index 69194b0..c60dafb 100644
--- modules/node/node.test
+++ modules/node/node.test
@@ -378,7 +378,7 @@ class PageCreationTestCase extends DrupalWebTestCase {
// Check that the failed rollback was logged.
$records = db_query("SELECT wid FROM {watchdog} WHERE message LIKE 'Explicit rollback failed%'")->fetchAll();
- $this->assertTrue(count($records) > 0, t('Transactions not supported, and rollback error logged to watchdog.'));
+ $this->assertTrue(count($records) > 0, t('Transactions not supported, and rollback error logged to watchdog.'));
}
// Check that the rollback error was logged.
diff --git modules/openid/openid.pages.inc modules/openid/openid.pages.inc
index 0cda23e..b5074d4 100644
--- modules/openid/openid.pages.inc
+++ modules/openid/openid.pages.inc
@@ -54,8 +54,8 @@ function openid_user_identities($account) {
}
$build['openid_table'] = array(
- '#theme' => 'table',
- '#header' => $header,
+ '#theme' => 'table',
+ '#header' => $header,
'#rows' => $rows,
);
$build['openid_user_add'] = drupal_get_form('openid_user_add');
diff --git modules/openid/openid.test modules/openid/openid.test
index b972e0d..e2309f7 100644
--- modules/openid/openid.test
+++ modules/openid/openid.test
@@ -154,7 +154,7 @@ class OpenIDFunctionalTest extends DrupalWebTestCase {
// Use a User-supplied Identity that is the URL of an XRDS document.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
- // Tell openid_test.module to respond with these SREG fields.
+ // Tell openid_test.module to respond with these SREG fields.
variable_set('openid_test_response', array('openid.sreg.nickname' => 'john', 'openid.sreg.email' => 'john@example.com'));
// Fill out and submit the login form.
@@ -163,7 +163,7 @@ class OpenIDFunctionalTest extends DrupalWebTestCase {
// Check we are on the OpenID redirect form.
$this->assertTitle(t('OpenID redirect'), t('OpenID redirect page was displayed.'));
-
+
// Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send'));
$this->assertText('john', t('User was logged in.'));
@@ -184,7 +184,7 @@ class OpenIDFunctionalTest extends DrupalWebTestCase {
// Use a User-supplied Identity that is the URL of an XRDS document.
$identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
- // Tell openid_test.module to respond with these SREG fields.
+ // Tell openid_test.module to respond with these SREG fields.
variable_set('openid_test_response', array('openid.sreg.nickname' => $this->web_user->name, 'openid.sreg.email' => 'mail@invalid#'));
// Fill out and submit the login form.
@@ -193,7 +193,7 @@ class OpenIDFunctionalTest extends DrupalWebTestCase {
// Check we are on the OpenID redirect form.
$this->assertTitle(t('OpenID redirect'), t('OpenID redirect page was displayed.'));
-
+
// Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send'));
@@ -237,7 +237,7 @@ class OpenIDFunctionalTest extends DrupalWebTestCase {
// Check we are on the OpenID redirect form.
$this->assertTitle(t('OpenID redirect'), t('OpenID redirect page was displayed.'));
-
+
// Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send'));
diff --git modules/search/search.api.php modules/search/search.api.php
index 5ee9167..0db73a9 100644
--- modules/search/search.api.php
+++ modules/search/search.api.php
@@ -16,7 +16,7 @@
*
* This hook allows a module to perform searches on content it defines
* (custom node types, users, or comments, for example) when a site search
- * is performed.
+ * is performed.
*
* Note that you can use form API to extend the search. You will need to use
* hook_form_alter() to add any additional required form elements. You can
diff --git modules/shortcut/shortcut.admin.inc modules/shortcut/shortcut.admin.inc
index 34659d4..949f064 100644
--- modules/shortcut/shortcut.admin.inc
+++ modules/shortcut/shortcut.admin.inc
@@ -79,7 +79,7 @@ function shortcut_set_switch($form, &$form_state, $account = NULL) {
);
$form['submit'] = array(
- '#type' => 'submit',
+ '#type' => 'submit',
'#value' => t('Save configuration'),
);
@@ -185,7 +185,7 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) {
'#default_value' => $status,
'#attributes' => array('class' => array('shortcut-status-select')),
);
-
+
$form['shortcuts'][$status][$mlid]['edit']['#markup'] = l(t('edit'), 'admin/config/system/shortcut/link/' . $mlid);
$form['shortcuts'][$status][$mlid]['delete']['#markup'] = l(t('delete'), 'admin/config/system/shortcut/link/' . $mlid . '/delete');
}
@@ -196,7 +196,7 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) {
);
$form['submit'] = array(
- '#type' => 'submit',
+ '#type' => 'submit',
'#value' => t('Save Changes'),
);
diff --git modules/shortcut/shortcut.module modules/shortcut/shortcut.module
index 552d44d..7cc96eb 100644
--- modules/shortcut/shortcut.module
+++ modules/shortcut/shortcut.module
@@ -380,7 +380,7 @@ function shortcut_current_displayed_set($account = NULL) {
$shortcut_set = shortcut_set_load($shortcut_set_name);
}
// Otherwise, use the default set.
- else {
+ else {
$shortcut_set = shortcut_default_set($account);
}
diff --git modules/simpletest/tests/bootstrap.test modules/simpletest/tests/bootstrap.test
index 412bad5..6ed872a 100644
--- modules/simpletest/tests/bootstrap.test
+++ modules/simpletest/tests/bootstrap.test
@@ -390,7 +390,7 @@ class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
/**
* Test that a variable reference returned by drupal_static() gets reset when
- * drupal_static_reset() is called.
+ * drupal_static_reset() is called.
*/
function testDrupalStatic() {
$name = __CLASS__ . '_' . __METHOD__;
diff --git modules/simpletest/tests/common_test_info.txt modules/simpletest/tests/common_test_info.txt
index a8cbf8e..6f684fc 100644
--- modules/simpletest/tests/common_test_info.txt
+++ modules/simpletest/tests/common_test_info.txt
@@ -2,9 +2,9 @@
; Test parsing with a simple string.
simple_string = A simple string
-; Test that constants can be used as values.
+; Test that constants can be used as values.
simple_constant = WATCHDOG_INFO
; After parsing the .info file, 'double_colon' should hold the literal value.
; Parsing should not throw a fatal error or try to access a class constant.
-double_colon = dummyClassName::
+double_colon = dummyClassName::
diff --git modules/system/image.gd.inc modules/system/image.gd.inc
index 0ea150a..935b84f 100644
--- modules/system/image.gd.inc
+++ modules/system/image.gd.inc
@@ -257,7 +257,7 @@ function image_gd_save(stdClass $image, $destination) {
if ($wrapper = file_stream_wrapper_get_instance_by_uri($destination)) {
$destination = $wrapper->realpath();
}
-
+
$extension = str_replace('jpg', 'jpeg', $image->info['extension']);
$function = 'image' . $extension;
if (!function_exists($function)) {
diff --git modules/system/page.tpl.php modules/system/page.tpl.php
index d91a054..98fc844 100644
--- modules/system/page.tpl.php
+++ modules/system/page.tpl.php
@@ -55,7 +55,7 @@
* - $page['sidebar_second']: Items for the second sidebar.
* - $page['header']: Items for the header region.
* - $page['footer']: Items for the footer region.
- *
+ *
* @see template_preprocess()
* @see template_preprocess_page()
* @see template_process()
diff --git modules/system/system.tar.inc modules/system/system.tar.inc
index ebd225c..170e952 100644
--- modules/system/system.tar.inc
+++ modules/system/system.tar.inc
@@ -51,7 +51,7 @@ define ('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
* @license http://www.opensource.org/licenses/bsd-license.php New BSD License
* @package Archive_Tar
*/
-class Archive_Tar
+class Archive_Tar
{
/**
* @var string Name of the Tar
diff --git modules/system/system.tokens.inc modules/system/system.tokens.inc
index f81f074..e7b2e9e 100644
--- modules/system/system.tokens.inc
+++ modules/system/system.tokens.inc
@@ -51,7 +51,7 @@ function system_token_info() {
$site['url-brief'] = array(
'name' => t("URL (brief)"),
'description' => t("The URL of the site's front page without the protocol."),
- );
+ );
$site['login-url'] = array(
'name' => t("Login page"),
'description' => t("The URL of the site's login page."),
@@ -186,7 +186,7 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a
break;
case 'url-brief':
- $replacements[$original] = preg_replace('!^https?://!', '', url('', $url_options));
+ $replacements[$original] = preg_replace('!^https?://!', '', url('', $url_options));
break;
case 'login-url':
diff --git modules/system/system.updater.inc modules/system/system.updater.inc
index c9eddb9..7df282a 100644
--- modules/system/system.updater.inc
+++ modules/system/system.updater.inc
@@ -6,7 +6,7 @@
* Subclasses of the Updater class to update Drupal core knows how to update.
* At this time, only modules and themes are supported.
*/
-
+
/**
* Class for updating modules using FileTransfer classes via authorize.php.
*/
@@ -127,7 +127,7 @@ class ThemeUpdater extends Updater implements DrupalUpdaterInterface {
->condition('name', $this->name)
->execute();
}
-
+
public function postInstallTasks() {
return array(
l(t('Set the !project theme as default', array('!project' => $this->title)), 'admin/appearance'),
diff --git modules/toolbar/toolbar.js modules/toolbar/toolbar.js
index 7284a66..aab92ab 100644
--- modules/toolbar/toolbar.js
+++ modules/toolbar/toolbar.js
@@ -62,8 +62,8 @@ Drupal.admin.toolbar.collapse = function() {
.html(toggle_text);
$('body').removeClass('toolbar-drawer');
$.cookie(
- 'Drupal.admin.toolbar.collapsed',
- 1,
+ 'Drupal.admin.toolbar.collapsed',
+ 1,
{
path: Drupal.settings.basePath,
// The cookie should "never" expire.
@@ -84,8 +84,8 @@ Drupal.admin.toolbar.expand = function() {
.html(toggle_text);
$('body').addClass('toolbar-drawer');
$.cookie(
- 'Drupal.admin.toolbar.collapsed',
- 0,
+ 'Drupal.admin.toolbar.collapsed',
+ 0,
{
path: Drupal.settings.basePath,
// The cookie should "never" expire.
diff --git modules/toolbar/toolbar.module modules/toolbar/toolbar.module
index bb92de5..154692a 100644
--- modules/toolbar/toolbar.module
+++ modules/toolbar/toolbar.module
@@ -61,7 +61,7 @@ function toolbar_toggle_page() {
/**
* Formats an element used to toggle the toolbar drawer's visibility.
- *
+ *
* @param $variables
* An associative array containing:
* - collapsed: A boolean value representing the toolbar drawer's visibility.
@@ -85,7 +85,7 @@ function theme_toolbar_toggle($variables) {
/**
* Determines the current state of the toolbar drawer's visibility.
- *
+ *
* @return
* TRUE when drawer is collapsed, FALSE when it is expanded.
*/
diff --git modules/translation/translation.pages.inc modules/translation/translation.pages.inc
index 8cb311f..fce8df4 100644
--- modules/translation/translation.pages.inc
+++ modules/translation/translation.pages.inc
@@ -55,12 +55,12 @@ function translation_node_overview($node) {
}
drupal_set_title(t('Translations of %title', array('%title' => $node->title[LANGUAGE_NONE][0]['value'])), PASS_THROUGH);
-
+
$build['translation_node_overview'] = array(
- '#theme' => 'table',
- '#header' => $header,
+ '#theme' => 'table',
+ '#header' => $header,
'#rows' => $rows,
);
-
+
return $build;
}
diff --git modules/update/update.manager.inc modules/update/update.manager.inc
index d1bce5b..a7446fd 100644
--- modules/update/update.manager.inc
+++ modules/update/update.manager.inc
@@ -35,7 +35,7 @@
* sets up a batch to copy each extracted update from the temporary location
* into the live web root.
*/
-
+
/**
* @defgroup update_manager_update Update manager for updating existing code.
* @{
@@ -180,7 +180,7 @@ function update_manager_update_form($form, $form_state = array(), $context) {
// Core needs manual updates at this time.
$projects['manual'][$name] = $entry;
break;
-
+
case 'module':
case 'theme':
$projects['enabled'][$name] = $entry;
@@ -565,7 +565,7 @@ function update_manager_install_form_submit($form, &$form_state) {
// @todo: find out if the module is already instealled, if so, throw an error.
$local_cache = $finfo->uri;
}
-
+
$directory = _update_manager_extract_directory();
try {
$archive = update_manager_archive_extract($local_cache, $directory);
@@ -601,12 +601,12 @@ function update_manager_install_form_submit($form, &$form_state) {
if (!$project_title) {
form_set_error($field, t('Unable to determine %project name.', array('%project' => $project)));
}
-
+
if ($updater->isInstalled()) {
form_set_error($field, t('%project is already installed.', array('%project' => $project_title)));
return;
}
-
+
$project_real_location = drupal_realpath($project_location);
$arguments = array(
'project' => $project,
@@ -733,7 +733,7 @@ function update_manager_file_get($url) {
if (!file_exists($cache_directory)) {
mkdir($cache_directory);
}
-
+
if (!file_exists($local)) {
return system_retrieve_file($url, $local);
}
diff --git modules/update/update.report.inc modules/update/update.report.inc
index be14d93..31b3c43 100644
--- modules/update/update.report.inc
+++ modules/update/update.report.inc
@@ -197,7 +197,7 @@ function theme_update_report($variables) {
case UPDATE_NOT_SUPPORTED:
$base_themes[] = t('%base_theme (!base_label)', array('%base_theme' => $base_theme, '!base_label' => theme('update_status_label', array('status' => $status[$base_key]))));
break;
-
+
default:
$base_themes[] = theme('placeholder', array('text' => $base_theme));
}
diff --git modules/user/user.api.php modules/user/user.api.php
index eda3478..c1bd190 100644
--- modules/user/user.api.php
+++ modules/user/user.api.php
@@ -402,7 +402,7 @@ function hook_user_role_update($role) {
* Inform other modules that a user role has been deleted.
*
* This hook allows you act when a user role has been deleted.
- * If your module stores references to roles, it's recommended that you
+ * If your module stores references to roles, it's recommended that you
* implement this hook and delete existing instances of the deleted role
* in your module database tables.
*
diff --git sites/default/default.settings.php sites/default/default.settings.php
index c90d2f5..4e9f7cc 100644
--- sites/default/default.settings.php
+++ sites/default/default.settings.php
@@ -67,8 +67,8 @@
* connection should use. This is usually the same as the name of the
* database type, such as mysql or sqlite, but not always. The other
* properties will vary depending on the driver. For SQLite, you must
- * specify a database file name in a directory that is writable by the
- * webserver. For most other drivers, you must specify a
+ * specify a database file name in a directory that is writable by the
+ * webserver. For most other drivers, you must specify a
* username, password, host, and database name.
*
* Some database engines support transactions. In order to enable
diff --git themes/garland/maintenance-page.tpl.php themes/garland/maintenance-page.tpl.php
index e6a1d1f..e6e14e7 100644
--- themes/garland/maintenance-page.tpl.php
+++ themes/garland/maintenance-page.tpl.php
@@ -50,7 +50,7 @@
$site_html = implode(' ', $site_fields);
if ($logo || $site_title) {
- print '