diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-01-26 14:08:44 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-01-26 14:08:44 +0000 |
commit | 6d3d75fe4b8fb1c862010cc87839f1d9ede43265 (patch) | |
tree | b801374bf914048d8659cb8df8f014f1486ee5ec /includes | |
parent | 8851b57acf1391fe1dbfab4877c1fdc7d63aac63 (diff) | |
download | brdo-6d3d75fe4b8fb1c862010cc87839f1d9ede43265.tar.gz brdo-6d3d75fe4b8fb1c862010cc87839f1d9ede43265.tar.bz2 |
- Removing whitespace.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/batch.inc | 2 | ||||
-rw-r--r-- | includes/database/mysql/database.inc | 2 | ||||
-rw-r--r-- | includes/database/mysql/schema.inc | 4 | ||||
-rw-r--r-- | includes/database/pgsql/database.inc | 2 | ||||
-rw-r--r-- | includes/database/pgsql/schema.inc | 6 | ||||
-rw-r--r-- | includes/database/schema.inc | 10 | ||||
-rw-r--r-- | includes/form.inc | 2 | ||||
-rw-r--r-- | includes/theme.inc | 8 |
8 files changed, 18 insertions, 18 deletions
diff --git a/includes/batch.inc b/includes/batch.inc index ada7ce8b3..194b53db3 100644 --- a/includes/batch.inc +++ b/includes/batch.inc @@ -268,7 +268,7 @@ function _batch_process() { // If we are in progressive mode, break processing after 1 second. if ($batch['progressive'] && timer_read('batch_processing') > 1000) { - // Record elapsed wall clock time. + // Record elapsed wall clock time. $current_set['elapsed'] = round((microtime(TRUE) - $current_set['start']) * 1000, 2); break; } diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc index 281bcfa09..afea7ebda 100644 --- a/includes/database/mysql/database.inc +++ b/includes/database/mysql/database.inc @@ -16,7 +16,7 @@ class DatabaseConnection_mysql extends DatabaseConnection { public function __construct(array $connection_options = array()) { // This driver defaults to non transaction support. $this->transactionSupport = !empty($connection_option['transactions']); - + // MySQL never supports transactional DDL. $this->transactionalDDLSupport = FALSE; diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index 3a525a1f3..5b0aadee7 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -15,11 +15,11 @@ class DatabaseSchema_mysql extends DatabaseSchema { /** - * Build a condition to match a table name against a standard information_schema. + * Build a condition to match a table name against a standard information_schema. * * MySQL uses databases like schemas rather than catalogs so when we build * a condition to query the information_schema.tables, we set the default - * database as the schema unless specified otherwise, and exclude table_catalog + * database as the schema unless specified otherwise, and exclude table_catalog * from the condition criteria. */ protected function buildTableNameCondition($table_name, $operator = '=') { diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc index 6e39bb232..c9dd63a06 100644 --- a/includes/database/pgsql/database.inc +++ b/includes/database/pgsql/database.inc @@ -16,7 +16,7 @@ class DatabaseConnection_pgsql extends DatabaseConnection { public function __construct(array $connection_options = array()) { // This driver defaults to transaction support, except if explicitly passed FALSE. $this->transactionSupport = !isset($connection_options['transactions']) || ($connection_options['transactions'] !== FALSE); - + // Transactional DDL is always available in PostgreSQL, // but we'll only enable it if standard transactions are. $this->transactionalDDLSupport = $this->transactionSupport; diff --git a/includes/database/pgsql/schema.inc b/includes/database/pgsql/schema.inc index 00f4b9fef..f467f0af1 100644 --- a/includes/database/pgsql/schema.inc +++ b/includes/database/pgsql/schema.inc @@ -115,9 +115,9 @@ class DatabaseSchema_pgsql extends DatabaseSchema { if (!empty($field['unsigned'])) { // Unsigned datatypes are not supported in PostgreSQL 8.3. In MySQL, // they are used to ensure a positive number is inserted and it also - // doubles the maximum integer size that can be stored in a field. - // The PostgreSQL schema in Drupal creates a check constraint - // to ensure that a value inserted is >= 0. To provide the extra + // doubles the maximum integer size that can be stored in a field. + // The PostgreSQL schema in Drupal creates a check constraint + // to ensure that a value inserted is >= 0. To provide the extra // integer capacity, here, we bump up the column field size. if (!isset($map)) { $map = $this->getFieldTypeMap(); diff --git a/includes/database/schema.inc b/includes/database/schema.inc index 5b4304dce..70b902b0e 100644 --- a/includes/database/schema.inc +++ b/includes/database/schema.inc @@ -129,7 +129,7 @@ abstract class DatabaseSchema { * * The information_schema is a SQL standard that provides information about the * database server and the databases, schemas, tables, columns and users within - * it. This makes information_schema a useful tool to use across the drupal + * it. This makes information_schema a useful tool to use across the drupal * database drivers and is used by a few different functions. The function below * describes the conditions to be meet when querying information_schema.tables * for drupal tables or information associated with drupal tables. Even though @@ -166,7 +166,7 @@ abstract class DatabaseSchema { /** * Check if a table exists. - * + * * @param $table * The name of the table in drupal (no prefixing). * @return @@ -176,7 +176,7 @@ abstract class DatabaseSchema { $condition = $this->buildTableNameCondition($this->connection->prefixTables('{' . $table . '}')); $condition->compile($this->connection); // Normally, we would heartily discourage the use of string - // concatination for conditionals like this however, we + // concatination for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. return db_query("SELECT table_name FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchField(); @@ -195,7 +195,7 @@ abstract class DatabaseSchema { $condition = $this->buildTableNameCondition($table_expression, 'LIKE'); $condition->compile($this->connection); // Normally, we would heartily discourage the use of string - // concatination for conditionals like this however, we + // concatination for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. return db_query("SELECT table_name FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchAllKeyed(0, 0); @@ -209,7 +209,7 @@ abstract class DatabaseSchema { $condition->condition('column_name', $column); $condition->compile($this->connection); // Normally, we would heartily discourage the use of string - // concatination for conditionals like this however, we + // concatination for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. return db_query("SELECT column_name FROM information_schema.columns WHERE " . (string) $condition, $condition->arguments())->fetchAllKeyed(0, 0); diff --git a/includes/form.inc b/includes/form.inc index 703046302..8ce4563cd 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -291,7 +291,7 @@ function form_set_cache($form_build_id, $form, $form_state) { */ function drupal_execute($form_id, &$form_state) { $args = func_get_args(); - + // Make sure $form_state is passed around by reference. $args[1] = &$form_state; diff --git a/includes/theme.inc b/includes/theme.inc index 855f0ef21..b71da908b 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1982,17 +1982,17 @@ function template_preprocess_node(&$variables) { $variables['node_url'] = url('node/' . $node->nid); $variables['title'] = check_plain($node->title); $variables['page'] = (bool)menu_get_object(); - + if ($node->build_mode == NODE_BUILD_PREVIEW) { unset($node->content['links']); } - + // Render taxonomy links separately. $variables['terms'] = !empty($node->content['links']['terms']) ? drupal_render($node->content['links']['terms']) : ''; - + // Render all remaining node links. $variables['links'] = !empty($node->content['links']) ? drupal_render($node->content['links']) : ''; - + // Render any comments. $variables['comments'] = !empty($node->content['comments']) ? drupal_render($node->content['comments']) : ''; |