diff options
author | Dries Buytaert <dries@buytaert.net> | 2010-01-30 07:59:26 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2010-01-30 07:59:26 +0000 |
commit | ea51c3215bc3defc45e87619f7b2232f85895fef (patch) | |
tree | dcef9202a1fec6385914c4ee48b13e80c25f3ce2 /includes | |
parent | 1e8da1f9ae32ccd1c6d19e24215e1cb293e97bbf (diff) | |
download | brdo-ea51c3215bc3defc45e87619f7b2232f85895fef.tar.gz brdo-ea51c3215bc3defc45e87619f7b2232f85895fef.tar.bz2 |
- Patch #606526 by axyjo, scor: remove trailing whitespaces and add newlines at end of files.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/authorize.inc | 4 | ||||
-rw-r--r-- | includes/database/pgsql/database.inc | 14 | ||||
-rw-r--r-- | includes/database/pgsql/install.inc | 6 | ||||
-rw-r--r-- | includes/filetransfer/local.inc | 2 | ||||
-rw-r--r-- | includes/filetransfer/ssh.inc | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/includes/authorize.inc b/includes/authorize.inc index aa02489fa..39a7125e6 100644 --- a/includes/authorize.inc +++ b/includes/authorize.inc @@ -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); } diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc index 218d10865..a42e377cb 100644 --- a/includes/database/pgsql/database.inc +++ b/includes/database/pgsql/database.inc @@ -52,10 +52,10 @@ class DatabaseConnection_pgsql extends DatabaseConnection { $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 @@ class DatabaseConnection_pgsql extends DatabaseConnection { */ 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 @@ class DatabaseConnection_pgsql extends DatabaseConnection { // 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 diff --git a/includes/database/pgsql/install.inc b/includes/database/pgsql/install.inc index 72f2865d3..2223781dc 100644 --- a/includes/database/pgsql/install.inc +++ b/includes/database/pgsql/install.inc @@ -32,13 +32,13 @@ class DatabaseTasks_pgsql extends DatabaseTasks { */ 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.'; diff --git a/includes/filetransfer/local.inc b/includes/filetransfer/local.inc index facba2c0d..14e246671 100644 --- a/includes/filetransfer/local.inc +++ b/includes/filetransfer/local.inc @@ -53,7 +53,7 @@ class FileTransferLocal extends FileTransfer implements FileTransferChmodInterfa throw new FileTransferException('Cannot remove file %file.', NULL, array('%file' => $file)); } } - + public function isDirectory($path) { return is_dir($path); } diff --git a/includes/filetransfer/ssh.inc b/includes/filetransfer/ssh.inc index 4ba03c1ae..f0bae72d0 100644 --- a/includes/filetransfer/ssh.inc +++ b/includes/filetransfer/ssh.inc @@ -59,7 +59,7 @@ class FileTransferSSH extends FileTransfer implements FileTransferChmodInterface throw new FileTransferException('Cannot remove @directory.', NULL, array('@directory' => $destination)); } } - + /** * WARNING: This is untested. It is not currently used, but should do the trick. */ |