Commit ea51c321 authored by Dries's avatar Dries
Browse files

- Patch #606526 by axyjo, scor: remove trailing whitespaces and add newlines at end of files.

parent 1e8da1f9
......@@ -134,7 +134,7 @@ function authorize_access_allowed() {
}
$output = theme('authorize_report', array('messages' => $results['messages']));
$links = array();
if (is_array($results['tasks'])) {
$links += $results['tasks'];
......
......@@ -19,7 +19,7 @@ function authorize_filetransfer_form($form_state) {
// CSS we depend on lives in modules/system/maintenance.css, which is loaded
// via the default maintenance theme.
$form['#attached']['js'][] = $base_url . '/misc/authorize.js';
// Get all the available ways to transfer files.
if (empty($_SESSION['authorize_filetransfer_backends'])) {
drupal_set_message(t('Unable to continue, no available methods of file transfer'), 'error');
......@@ -182,7 +182,7 @@ function authorize_filetransfer_form_submit($form, &$form_state) {
variable_set('authorize_filetransfer_connection_settings_' . $filetransfer_backend, $connection_settings);
$filetransfer = authorize_get_filetransfer($filetransfer_backend, $form_state['values']['connection_settings'][$filetransfer_backend]);
// Now run the operation.
authorize_run_operation($filetransfer);
}
......
......@@ -52,10 +52,10 @@ public function query($query, array $args = array(), $options = array()) {
$options += $this->defaultOptions();
// The PDO PostgreSQL driver has a bug which
// The PDO PostgreSQL driver has a bug which
// doesn't type cast booleans correctly when
// parameters are bound using associative
// arrays.
// parameters are bound using associative
// arrays.
// See http://bugs.php.net/bug.php?id=48383
foreach ($args as &$value) {
if (is_bool($value)) {
......@@ -141,12 +141,12 @@ public function mapConditionOperator($operator) {
*/
public function nextId($existing = 0) {
// Retrive the name of the sequence. This information cannot be cached
// Retrive the name of the sequence. This information cannot be cached
// because the prefix may change, for example, like it does in simpletests.
$sequence_name = $this->makeSequenceName('sequences', 'value');
// When PostgreSQL gets a value too small then it will lock the table,
// retry the INSERT and if it's still too small then alter the sequence.
// When PostgreSQL gets a value too small then it will lock the table,
// retry the INSERT and if it's still too small then alter the sequence.
$id = $this->query("SELECT nextval('" . $sequence_name . "')")->fetchField();
if ($id > $existing) {
return $id;
......@@ -154,7 +154,7 @@ public function nextId($existing = 0) {
// PostgreSQL advisory locks are simply locks to be used by an
// application such as Drupal. This will prevent other Drupal proccesses
// from altering the sequence while we are.
// from altering the sequence while we are.
$this->query("SELECT pg_advisory_lock(" . POSTGRESQL_NEXTID_LOCK . ")");
// While waiting to obtain the lock, the sequence may have been altered
......
......@@ -32,13 +32,13 @@ public function name() {
*/
protected function checkEncoding() {
try {
if (db_query('SHOW server_encoding')->fetchField() == 'UTF8') {
if (db_query('SHOW server_encoding')->fetchField() == 'UTF8') {
$this->pass(st('Database is encoded in UTF-8'));
}
else {
$replacements = array(
'%encoding' => 'UTF8',
'%driver' => $this->name(),
'%encoding' => 'UTF8',
'%driver' => $this->name(),
'!link' => '<a href="INSTALL.pgsql.txt">INSTALL.pgsql.txt</a>'
);
$text = 'The %driver database must use %encoding encoding to work with Drupal.';
......
......@@ -53,7 +53,7 @@ protected function removeFileJailed($file) {
throw new FileTransferException('Cannot remove file %file.', NULL, array('%file' => $file));
}
}
public function isDirectory($path) {
return is_dir($path);
}
......
......@@ -59,7 +59,7 @@ protected function removeFileJailed($destination) {
throw new FileTransferException('Cannot remove @directory.', NULL, array('@directory' => $destination));
}
}
/**
* WARNING: This is untested. It is not currently used, but should do the trick.
*/
......
......@@ -157,7 +157,7 @@ function aggregator_parse_feed(&$data, $feed) {
if (empty($item['author']) && !empty($item['dc:creator'])) {
$item['author'] = $item['dc:creator'];
}
$item += array('author' => '', 'description' => '');
// Store on $feed object. This is where processors will look for parsed items.
......
......@@ -42,7 +42,7 @@
*/
?>
<div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
<?php print render($title_prefix); ?>
<?php if ($block->subject): ?>
<h2<?php print $title_attributes; ?>><?php print $block->subject ?></h2>
......
......@@ -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.
*/
?>
<?php foreach ($book_menus as $book_id => $menu) : ?>
......
......@@ -11,7 +11,7 @@ function color_help($path, $arg) {
$output .= '<p>' . t('The Color module allows users with the <em>Administer site configuration</em> 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 <a href="@color">Color module</a>.', array('@color' => 'http://drupal.org/handbook/modules/color')) . '</p>';
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
$output .= '<dt>' . t('Changing colors') . '</dt>';
$output .= '<dt>' . t('Changing colors') . '</dt>';
$output .= '<dd>' . 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 <em>Settings</em> link for your theme on the <a href='@configure'>Themes administration page</a>. 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 <a href='@troubleshoot'>follow these troubleshooting procedures</a>.", array('@configure' => url('admin/appearance'), '@troubleshoot' => 'http://drupal.org/node/109457')) . '</dd>';
$output .= '<dd>' . 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, <em>you must save your color settings again, even if they haven't changed</em>. This step is required because the module stylesheets (in the files directory) need to be recreated to include your changes.") . '</dd>';
$output .= '</dl>';
......
......@@ -75,7 +75,7 @@ function comment_admin_overview($form, &$form_state, $arg) {
->limit(50)
->orderByHeader($header)
->execute();
$cids = array();
// We collect a sorted list of node_titles during the query to attach to the
......
......@@ -1229,4 +1229,4 @@ class CommentContentRebuild extends CommentHelperCase {
// This means that the content was rebuilt as the added test property no longer exists.
$this->assertFalse(isset($built_content['test_property']), t('Comment content was emptied before being built.'));
}
}
\ No newline at end of file
}
......@@ -28,7 +28,7 @@ function dblog_help($path, $arg) {
$output .= '<dt>' . t('Debugging site problems') . '</dt>';
$output .= '<dd>' . t('In case of errors or problems with the site, the <a href="@dblog">Recent log entries</a> page can be useful for debugging, since it shows the sequence of events. The log entries include usage information, warnings, and errors.', array('@dblog' => url('admin/reports/dblog'))) . '</dd>';
$output .= '</dl>';
return $output;
return $output;
case 'admin/reports/dblog':
return '<p>' . t('The Database logging module monitors your website, capturing system events in a log (shown here) to be reviewed by an authorized individual at a later time. This log is a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the Recent log entries report on a regular basis, as it is often the only way to tell what is going on.') . '</p>';
}
......
......@@ -999,7 +999,7 @@ function field_attach_delete_revision($obj_type, $object) {
* with all operators below. A FieldQueryException will be raised if an
* unsupported condition is specified.
* Supported columns:
* - any of the columns defined in hook_field_schema() for $field_name's
* - any of the columns defined in hook_field_schema() for $field_name's
* field type: condition on field value,
* - 'type': condition on object type (e.g. 'node', 'user'...),
* - 'bundle': condition on object bundle (e.g. node type),
......
......@@ -6,4 +6,4 @@ version = VERSION
core = 7.x
files[] = text.module
files[] = text.test
required = TRUE
\ No newline at end of file
required = TRUE
......@@ -2376,7 +2376,7 @@ class FieldInstanceCrudTestCase extends FieldTestCase {
}
// Check that an instance cannot be added to an object type
// forbidden by the field.
// forbidden by the field.
try {
$instance = $this->instance_definition;
$instance['field_name'] = $field_restricted['field_name'];
......
......@@ -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.
......
......@@ -506,4 +506,4 @@ function theme_image_formatter($variables) {
}
return $output;
}
\ No newline at end of file
}
......@@ -333,7 +333,7 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
$edit = array('translations['. $langcode .']' => $this->randomString());
$this->drupalPost($url, $edit, t('Save translations'));
// Trigger JavaScript translation parsing and building.
// Trigger JavaScript translation parsing and building.
locale_inc_callback('_locale_rebuild_js', $langcode);
// Retrieve the JavaScript translation hash code for the custom language to
......
......@@ -63,7 +63,7 @@ function menu_overview_form($form, &$form_state, $menu) {
$form = array_merge($form, _menu_overview_tree_form($tree));
$form['#menu'] = $menu;
if (element_children($form)) {
$form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions')));
$form['actions']['submit'] = array(
......
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