' . $e->getMessage() . '
', + '!message' => '' . $e->getMessage() . '
', '@handbook_url' => 'http://drupal.org/documentation/install/modules-themes', ))); } diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 2856529..6c3d9b6 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -43,9 +43,9 @@ define('CACHE_TEMPORARY', -1); * Logging severity levels as defined in RFC 3164. * * The WATCHDOG_* constant definitions correspond to the logging severity levels - * defined in RFC 3164, section 4.1.1. PHP supplies predefined LOG_* constants + * defined in RFC 3164, section 4.1.1. PHP supplies predefined LOG_* constants * for use in the syslog() function, but their values on Windows builds do not - * correspond to RFC 3164. The associated PHP bug report was closed with the + * correspond to RFC 3164. The associated PHP bug report was closed with the * comment, "And it's also not a bug, as Windows just have less log levels," * and "So the behavior you're seeing is perfectly normal." * @@ -1868,7 +1868,7 @@ function drupal_block_denied($ip) { * @param $count * The number of characters (bytes) to return in the string. */ -function drupal_random_bytes($count) { +function drupal_random_bytes($count) { // $random_state does not use drupal_static as it stores random bytes. static $random_state, $bytes; // Initialize on the first call. The contents of $_SERVER includes a mix of @@ -2368,7 +2368,7 @@ function drupal_valid_test_ua() { if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/^(simpletest\d+);(.+);(.+);(.+)$/", $_SERVER['HTTP_USER_AGENT'], $matches)) { list(, $prefix, $time, $salt, $hmac) = $matches; - $check_string = $prefix . ';' . $time . ';' . $salt; + $check_string = $prefix . ';' . $time . ';' . $salt; // We use the salt from settings.php to make the HMAC key, since // the database is not yet initialized and we can't access any Drupal variables. // The file properties add more entropy not easily accessible to others. diff --git a/includes/cache.inc b/includes/cache.inc index 9b60a7e..bd5812c 100644 --- a/includes/cache.inc +++ b/includes/cache.inc @@ -158,7 +158,7 @@ function cache_set($cid, $data, $bin = 'cache', $expire = CACHE_PERMANENT) { * * @param $wildcard * If $wildcard is TRUE, cache IDs starting with $cid are deleted in - * addition to the exact cache ID specified by $cid. If $wildcard is + * addition to the exact cache ID specified by $cid. If $wildcard is * TRUE and $cid is '*' then the entire bin $bin is emptied. */ function cache_clear_all($cid = NULL, $bin = NULL, $wildcard = FALSE) { diff --git a/includes/common.inc b/includes/common.inc index 72fcf76..24d9251 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -2756,7 +2756,7 @@ function drupal_add_html_head_link($attributes, $header = FALSE) { * See drupal_get_css() where the overrides are performed. Also, if the * direction of the current language is right-to-left (Hebrew, Arabic, * etc.), the function will also look for an RTL CSS file and append it to - * the list. The name of this file should have an '-rtl.css' suffix. For + * the list. The name of this file should have an '-rtl.css' suffix. For * example a CSS file called 'mymodule-name.css' will have a * 'mymodule-name-rtl.css' file added to the list, if exists in the same * directory. This CSS file should contain overrides for properties which @@ -3373,7 +3373,7 @@ function drupal_pre_render_styles($elements) { * in $css while the value is the cache file name. The cache file is generated * in two cases. First, if there is no file name value for the key, which will * happen if a new file name has been added to $css or after the lookup - * variable is emptied to force a rebuild of the cache. Second, the cache + * variable is emptied to force a rebuild of the cache. Second, the cache * file is generated if it is missing on disk. Old cache files are not deleted * immediately when the lookup variable is emptied, but are deleted after a set * period by drupal_delete_file_if_stale(). This ensures that files referenced @@ -3600,12 +3600,12 @@ function _drupal_load_stylesheet($matches) { $directory = dirname($filename); // If the file is in the current directory, make sure '.' doesn't appear in // the url() path. - $directory = $directory == '.' ? '' : $directory .'/'; + $directory = $directory == '.' ? '' : $directory . '/'; // Alter all internal url() paths. Leave external paths alone. We don't need // to normalize absolute paths here (i.e. remove folder/... segments) because // that will be done later. - return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1'. $directory, $file); + return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1' . $directory, $file); } /** @@ -3803,7 +3803,7 @@ function drupal_region_class($region) { * to tell the user that a new message arrived, by opening a pop up, alert * box, etc.). This should only be used for JavaScript that cannot be executed * from a file. When adding inline code, make sure that you are not relying on - * $() being the jQuery function. Wrap your code in + * $() being the jQuery function. Wrap your code in * @code (function ($) {... })(jQuery); @endcode * or use jQuery() instead of $(). * - Add external JavaScript ('external'): Allows the inclusion of external @@ -3923,7 +3923,7 @@ function drupal_region_class($region) { * happened later in the page request gets added to the page after one for * which drupal_add_js() happened earlier in the page request. * - defer: If set to TRUE, the defer attribute is set on the <script> - * tag. Defaults to FALSE. + * tag. Defaults to FALSE. * - cache: If set to FALSE, the JavaScript file is loaded anew on every page * call; in other words, it is not cached. Used only when 'type' references * a JavaScript file. Defaults to TRUE. @@ -4144,7 +4144,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS ), ); foreach ($items as $item) { - $query_string = empty($item['version']) ? $default_query_string : $js_version_string . $item['version']; + $query_string = empty($item['version']) ? $default_query_string : $js_version_string . $item['version']; switch ($item['type']) { case 'setting': @@ -4236,7 +4236,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS * ); * @endcode * - * 'js', 'css', and 'library' are types that get special handling. For any + * 'js', 'css', and 'library' are types that get special handling. For any * other kind of attached data, the array key must be the full name of the * callback function and each value an array of arguments. For example: * @code @@ -4730,7 +4730,7 @@ function drupal_add_tabledrag($table_id, $action, $relationship, $group, $subgro * $files while the value is the cache file name. The cache file is generated * in two cases. First, if there is no file name value for the key, which will * happen if a new file name has been added to $files or after the lookup - * variable is emptied to force a rebuild of the cache. Second, the cache + * variable is emptied to force a rebuild of the cache. Second, the cache * file is generated if it is missing on disk. Old cache files are not deleted * immediately when the lookup variable is emptied, but are deleted after a set * period by drupal_delete_file_if_stale(). This ensures that files referenced @@ -7779,7 +7779,7 @@ function archiver_get_extensions() { * Create the appropriate archiver for the specified file. * * @param $file - * The full path of the archive file. Note that stream wrapper + * The full path of the archive file. Note that stream wrapper * paths are supported, but not remote ones. * @return * A newly created instance of the archiver class appropriate diff --git a/includes/database/database.inc b/includes/database/database.inc index 6108614..70f8ae0 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -5,7 +5,7 @@ * Core systems for the database layer. * * Classes required for basic functioning of the database system should be - * placed in this file. All utility functions should also be placed in this + * placed in this file. All utility functions should also be placed in this * file only, as they cannot auto-load the way classes can. */ @@ -120,8 +120,8 @@ * Drupal also supports transactions, including a transparent fallback for * databases that do not support transactions. To start a new transaction, * simply call $txn = db_transaction(); in your own code. The transaction will - * remain open for as long as the variable $txn remains in scope. When $txn is - * destroyed, the transaction will be committed. If your transaction is nested + * remain open for as long as the variable $txn remains in scope. When $txn is + * destroyed, the transaction will be committed. If your transaction is nested * inside of another then Drupal will track each transaction and only commit * the outer-most transaction when the last transaction object goes out out of * scope, that is, all relevant queries completed successfully. @@ -151,7 +151,7 @@ * watchdog_exception('type', $e); * } * - * // $txn goes out of scope here. Unless the transaction was rolled back, it + * // $txn goes out of scope here. Unless the transaction was rolled back, it * // gets automatically commited here. * } * @@ -194,7 +194,7 @@ abstract class DatabaseConnection extends PDO { /** * The key representing this connection. - * + * * The key is a unique string which identifies a database connection. A * connection can be a single server or a cluster of master and slaves (use * target to pick between master and slave). @@ -213,7 +213,7 @@ abstract class DatabaseConnection extends PDO { /** * Tracks the number of "layers" of transactions currently active. * - * On many databases transactions cannot nest. Instead, we track + * On many databases transactions cannot nest. Instead, we track * nested calls to transactions and collapse them into a single * transaction. * @@ -719,9 +719,9 @@ abstract class DatabaseConnection extends PDO { $new_keys = array(); foreach ($data as $i => $value) { // This assumes that there are no other placeholders that use the same - // name. For example, if the array placeholder is defined as :example + // name. For example, if the array placeholder is defined as :example // and there is already an :example_2 placeholder, this will generate - // a duplicate key. We do not account for that as the calling code + // a duplicate key. We do not account for that as the calling code // is already broken if that happens. $new_keys[$key . '_' . $i] = $value; } @@ -1680,7 +1680,7 @@ abstract class Database { * Closes a connection to the server specified by the given key and target. * * @param $target - * The database target name. Defaults to NULL meaning that all target + * The database target name. Defaults to NULL meaning that all target * connections will be closed. * @param $key * The database connection key. Defaults to NULL which means the active key. @@ -1776,7 +1776,7 @@ class DatabaseTransactionOutOfOrderException extends Exception { } /** * Exception thrown for merge queries that do not make semantic sense. * - * There are many ways that a merge query could be malformed. They should all + * There are many ways that a merge query could be malformed. They should all * throw this exception and set an appropriately descriptive message. */ class InvalidMergeQueryException extends Exception {} @@ -2195,9 +2195,9 @@ class DatabaseStatementBase extends PDOStatement implements DatabaseStatementInt * Empty implementation of a database statement. * * This class satisfies the requirements of being a database statement/result - * object, but does not actually contain data. It is useful when developers + * object, but does not actually contain data. It is useful when developers * need to safely return an "empty" result set without connecting to an actual - * database. Calling code can then treat it the same as if it were an actual + * database. Calling code can then treat it the same as if it were an actual * result set that happens to contain no records. * * @see SearchQuery @@ -2653,7 +2653,7 @@ function db_xor() { /** * Returns a new DatabaseCondition, set to the specified conjunction. * - * Internal API function call. The db_and(), db_or(), and db_xor() + * Internal API function call. The db_and(), db_or(), and db_xor() * functions are preferred. * * @param $conjunction diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc index 7d5d859..429dc10 100644 --- a/includes/database/mysql/database.inc +++ b/includes/database/mysql/database.inc @@ -115,7 +115,7 @@ class DatabaseConnection_mysql extends DatabaseConnection { public function nextIdDelete() { // While we want to clean up the table to keep it up from occupying too // much storage and memory, we must keep the highest value in the table - // because InnoDB uses an in-memory auto-increment counter as long as the + // because InnoDB uses an in-memory auto-increment counter as long as the // server runs. When the server is stopped and restarted, InnoDB // reinitializes the counter for each table for the first INSERT to the // table based solely on values from the table so deleting all values would diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index 4e88fa1..5b54188 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -492,7 +492,7 @@ class DatabaseSchema_mysql extends DatabaseSchema { public function tableExists($table) { // The information_schema table is very slow to query under MySQL 5.0. - // Instead, we try to select from the table in question. If it fails, + // Instead, we try to select from the table in question. If it fails, // the most likely reason is that it does not exist. That is dramatically // faster than using information_schema. // @link http://bugs.mysql.com/bug.php?id=19588 diff --git a/includes/database/query.inc b/includes/database/query.inc index c7363f2..a40c356 100644 --- a/includes/database/query.inc +++ b/includes/database/query.inc @@ -77,7 +77,7 @@ interface QueryConditionInterface { /** * Sets a condition that the specified subquery returns values. - * + * * @param SelectQueryInterface $select * The subquery that must contain results. * @@ -85,10 +85,10 @@ interface QueryConditionInterface { * The called object. */ public function exists(SelectQueryInterface $select); - + /** * Sets a condition that the specified subquery returns no values. - * + * * @param SelectQueryInterface $select * The subquery that must not contain results. * @@ -96,7 +96,7 @@ interface QueryConditionInterface { * The called object. */ public function notExists(SelectQueryInterface $select); - + /** * Gets a complete list of all conditions in this conditional clause. * @@ -277,14 +277,14 @@ abstract class Query implements QueryPlaceholderInterface { /** * The target of the connection object. - * + * * @var string */ protected $connectionTarget; /** * The key of the connection object. - * + * * @var string */ protected $connectionKey; @@ -798,7 +798,7 @@ class DeleteQuery extends Query implements QueryConditionInterface { $this->condition->notExists($select); return $this; } - + /** * Implements QueryConditionInterface::conditions(). */ @@ -1047,7 +1047,7 @@ class UpdateQuery extends Query implements QueryConditionInterface { $this->condition->notExists($select); return $this; } - + /** * Implements QueryConditionInterface::conditions(). */ @@ -1539,7 +1539,7 @@ class MergeQuery extends Query implements QueryConditionInterface { $this->condition->notExists($select); return $this; } - + /** * Implements QueryConditionInterface::conditions(). */ @@ -1756,14 +1756,14 @@ class DatabaseCondition implements QueryConditionInterface, Countable { public function exists(SelectQueryInterface $select) { return $this->condition('', $select, 'EXISTS'); } - + /** * Implements QueryConditionInterface::notExists(). */ public function notExists(SelectQueryInterface $select) { return $this->condition('', $select, 'NOT EXISTS'); } - + /** * Implements QueryConditionInterface::conditions(). */ diff --git a/includes/database/schema.inc b/includes/database/schema.inc index 41c6802..0cbc3c7 100644 --- a/includes/database/schema.inc +++ b/includes/database/schema.inc @@ -109,17 +109,17 @@ require_once __DIR__ . '/query.inc'; * 'description' => 'The base table for nodes.', * 'fields' => array( * 'nid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE), - * 'vid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE,'default' => 0), - * 'type' => array('type' => 'varchar','length' => 32,'not null' => TRUE, 'default' => ''), - * 'language' => array('type' => 'varchar','length' => 12,'not null' => TRUE,'default' => ''), - * 'title' => array('type' => 'varchar','length' => 255,'not null' => TRUE, 'default' => ''), + * 'vid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), + * 'type' => array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => ''), + * 'language' => array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => ''), + * 'title' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''), * 'uid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), * 'status' => array('type' => 'int', 'not null' => TRUE, 'default' => 1), * 'created' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), * 'changed' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), * 'comment' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), * 'promote' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), - * 'moderate' => array('type' => 'int', 'not null' => TRUE,'default' => 0), + * 'moderate' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), * 'sticky' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), * 'tnid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0), * 'translate' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), diff --git a/includes/database/select.inc b/includes/database/select.inc index 7504778..a33b6ed 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -10,11 +10,11 @@ require_once __DIR__ . '/query.inc'; /** * Interface for extendable query objects. * - * "Extenders" follow the "Decorator" OOP design pattern. That is, they wrap - * and "decorate" another object. In our case, they implement the same interface + * "Extenders" follow the "Decorator" OOP design pattern. That is, they wrap + * and "decorate" another object. In our case, they implement the same interface * as select queries and wrap a select query, to which they delegate almost all - * operations. Subclasses of this class may implement additional methods or - * override existing methods as appropriate. Extenders may also wrap other + * operations. Subclasses of this class may implement additional methods or + * override existing methods as appropriate. Extenders may also wrap other * extender objects, allowing for arbitrarily complex "enhanced" queries. */ interface QueryExtendableInterface { @@ -23,9 +23,9 @@ interface QueryExtendableInterface { * Enhance this object by wrapping it in an extender object. * * @param $extender_name - * The base name of the extending class. The base name will be checked + * The base name of the extending class. The base name will be checked * against the current database connection to allow driver-specific subclasses - * as well, using the same logic as the query objects themselves. For example, + * as well, using the same logic as the query objects themselves. For example, * PagerDefault_mysql is the MySQL-specific override for PagerDefault. * @return QueryExtendableInterface * The extender object, which now contains a reference to this object. @@ -506,7 +506,7 @@ interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableIn /** * Clone magic method. * - * Select queries have dependent objects that must be deep-cloned. The + * Select queries have dependent objects that must be deep-cloned. The * connection object itself, however, should not be cloned as that would * duplicate the connection itself. */ @@ -712,7 +712,7 @@ class SelectQueryExtender implements SelectQueryInterface { public function execute() { // By calling preExecute() here, we force it to preprocess the extender - // object rather than just the base query object. That means + // object rather than just the base query object. That means // hook_query_alter() gets access to the extended object. if (!$this->preExecute($this)) { return NULL; @@ -836,7 +836,7 @@ class SelectQueryExtender implements SelectQueryInterface { $this->query->notExists($select); return $this; } - + public function __toString() { return (string) $this->query; } @@ -845,7 +845,7 @@ class SelectQueryExtender implements SelectQueryInterface { $this->uniqueIdentifier = uniqid('', TRUE); // We need to deep-clone the query we're wrapping, which in turn may - // deep-clone other objects. Exciting! + // deep-clone other objects. $this->query = clone($this->query); } @@ -853,18 +853,18 @@ class SelectQueryExtender implements SelectQueryInterface { * Magic override for undefined methods. * * If one extender extends another extender, then methods in the inner extender - * will not be exposed on the outer extender. That's because we cannot know + * will not be exposed on the outer extender. That's because we cannot know * in advance what those methods will be, so we cannot provide wrapping - * implementations as we do above. Instead, we use this slower catch-all method + * implementations as we do above. Instead, we use this slower catch-all method * to handle any additional methods. */ public function __call($method, $args) { $return = call_user_func_array(array($this->query, $method), $args); // Some methods will return the called object as part of a fluent interface. - // Others will return some useful value. If it's a value, then the caller - // probably wants that value. If it's the called object, then we instead - // return this object. That way we don't "lose" an extender layer when + // Others will return some useful value. If it's a value, then the caller + // probably wants that value. If it's the called object, then we instead + // return this object. That way we don't "lose" an extender layer when // chaining methods together. if ($return instanceof SelectQueryInterface) { return $this; @@ -1088,7 +1088,7 @@ class SelectQuery extends Query implements SelectQueryInterface { $this->where->notExists($select); return $this; } - + public function compile(DatabaseConnection $connection, QueryPlaceholderInterface $queryPlaceholder) { $this->where->compile($connection, $queryPlaceholder); $this->having->compile($connection, $queryPlaceholder); @@ -1172,17 +1172,17 @@ class SelectQuery extends Query implements SelectQueryInterface { $this->having->isNotNull($field); return $this; } - + public function havingExists(SelectQueryInterface $select) { $this->having->exists($select); return $this; } - + public function havingNotExists(SelectQueryInterface $select) { $this->having->notExists($select); return $this; } - + public function forUpdate($set = TRUE) { if (isset($set)) { $this->forUpdate = $set; @@ -1454,7 +1454,7 @@ class SelectQuery extends Query implements SelectQueryInterface { if (!$count->distinct) { // When not executing a distinct query, we can zero-out existing fields - // and expressions that are not used by a GROUP BY. Fields listed in + // and expressions that are not used by a GROUP BY. Fields listed in // the GROUP BY clause need to be present in the query. $fields =& $count->getFields(); foreach (array_keys($fields) as $field) { @@ -1554,7 +1554,7 @@ class SelectQuery extends Query implements SelectQueryInterface { // Don't use the AS keyword for table aliases, as some // databases don't support it (e.g., Oracle). - $query .= $table_string . ' ' . $this->connection->escapeTable($table['alias']); + $query .= $table_string . ' ' . $this->connection->escapeTable($table['alias']); if (!empty($table['condition'])) { $query .= ' ON ' . $table['condition']; diff --git a/includes/database/sqlite/database.inc b/includes/database/sqlite/database.inc index 0fc0b55..727819a 100644 --- a/includes/database/sqlite/database.inc +++ b/includes/database/sqlite/database.inc @@ -37,7 +37,7 @@ class DatabaseConnection_sqlite extends DatabaseConnection { /** * All databases attached to the current database. This is used to allow * prefixes to be safely handled without locking the table - * + * * @var array */ protected $attachedDatabases = array(); @@ -46,10 +46,10 @@ class DatabaseConnection_sqlite extends DatabaseConnection { * Whether or not a table has been dropped this request: the destructor will * only try to get rid of unnecessary databases if there is potential of them * being empty. - * + * * This variable is set to public because DatabaseSchema_sqlite needs to * access it. However, it should not be manually set. - * + * * @var boolean */ var $tableDropped = FALSE; @@ -350,7 +350,7 @@ class DatabaseConnection_sqlite extends DatabaseConnection { } // Commit everything since SAVEPOINT $name. - while($savepoint = array_pop($this->transactionLayers)) { + while ($savepoint = array_pop($this->transactionLayers)) { if ($savepoint != $name) continue; // If there are no more layers left then we should commit or rollback. diff --git a/includes/entity.inc b/includes/entity.inc index 99baf49..fbe3003 100644 --- a/includes/entity.inc +++ b/includes/entity.inc @@ -739,7 +739,7 @@ class EntityFieldQuery { * two columns, 'color' and 'shape', and for entity id 1, there are two * values: red/square and blue/circle. Entity ID 1 does not have values * corresponding to 'red circle', however if you pass 'red' and 'circle' as - * conditions, it will appear in the results - by default queries will run + * conditions, it will appear in the results - by default queries will run * against any combination of deltas. By passing the conditions with the * same $delta_group it will ensure that only values attached to the same * delta are matched, and entity 1 would then be excluded from the results. @@ -941,7 +941,7 @@ class EntityFieldQuery { * Enable a pager for the query. * * @param $limit - * An integer specifying the number of elements per page. If passed a false + * An integer specifying the number of elements per page. If passed a false * value (FALSE, 0, NULL), the pager is disabled. * @param $element * An optional integer to distinguish between multiple pagers on one page. @@ -976,7 +976,7 @@ class EntityFieldQuery { */ public function tableSort(&$headers) { // If 'field' is not initialized, the header columns aren't clickable - foreach ($headers as $key =>$header) { + foreach ($headers as $key => $header) { if (is_array($header) && isset($header['specifier'])) { $headers[$key]['field'] = ''; } diff --git a/includes/errors.inc b/includes/errors.inc index 84e9c77..5dc1c8a 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -218,7 +218,7 @@ function _drupal_log_error($error, $fatal = FALSE) { if (drupal_is_cli()) { if ($fatal) { // When called from CLI, simply output a plain text message. - print html_entity_decode(strip_tags(t('%type: !message in %function (line %line of %file).', $error))). "\n"; + print html_entity_decode(strip_tags(t('%type: !message in %function (line %line of %file).', $error))) . "\n"; exit; } } diff --git a/includes/file.inc b/includes/file.inc index 6e2e5cb..8dd8e4c 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -485,7 +485,7 @@ function file_save_htaccess($directory, $private = TRUE) { else { $directory = rtrim($directory, '/\\'); } - $htaccess_path = $directory . '/.htaccess'; + $htaccess_path = $directory . '/.htaccess'; if (file_exists($htaccess_path)) { // Short circuit if the .htaccess file already exists. @@ -1707,7 +1707,7 @@ function file_validate_size(stdClass $file, $file_limit = 0, $user_limit = 0) { $errors = array(); - // Bypass validation for uid = 1. + // Bypass validation for uid = 1. if ($user->uid != 1) { if ($file_limit && $file->filesize > $file_limit) { $errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($file->filesize), '%maxsize' => format_size($file_limit))); diff --git a/includes/filetransfer/ftp.inc b/includes/filetransfer/ftp.inc index 838dc7c..a85831d 100644 --- a/includes/filetransfer/ftp.inc +++ b/includes/filetransfer/ftp.inc @@ -82,11 +82,11 @@ class FileTransferFTPExtension extends FileTransferFTP implements FileTransferCh if (!$list) { $list = array(); } - foreach ($list as $item){ + foreach ($list as $item) { if ($item == '.' || $item == '..') { continue; } - if (@ftp_chdir($this->connection, $item)){ + if (@ftp_chdir($this->connection, $item)) { ftp_cdup($this->connection); $this->removeDirectory(ftp_pwd($this->connection) . '/' . $item); } @@ -122,7 +122,7 @@ class FileTransferFTPExtension extends FileTransferFTP implements FileTransferCh function chmodJailed($path, $mode, $recursive) { if (!ftp_chmod($this->connection, $mode, $path)) { - throw new FileTransferException("Unable to set permissions on %file", NULL, array ('%file' => $path)); + throw new FileTransferException("Unable to set permissions on %file", NULL, array('%file' => $path)); } if ($this->isDirectory($path) && $recursive) { $filelist = @ftp_nlist($this->connection, $path); diff --git a/includes/filetransfer/ssh.inc b/includes/filetransfer/ssh.inc index 43ec324..fdd1d0a 100644 --- a/includes/filetransfer/ssh.inc +++ b/includes/filetransfer/ssh.inc @@ -62,7 +62,7 @@ class FileTransferSSH extends FileTransfer implements FileTransferChmodInterface } /** - * WARNING: This is untested. It is not currently used, but should do the trick. + * WARNING: This is untested. It is not currently used, but should do the trick. */ public function isDirectory($path) { $directory = escapeshellarg($path); @@ -72,7 +72,8 @@ class FileTransferSSH extends FileTransfer implements FileTransferChmodInterface return TRUE; } return FALSE; - } else { + } + else { throw new FileTransferException('Cannot check @path.', NULL, array('@path' => $path)); } } @@ -85,7 +86,8 @@ class FileTransferSSH extends FileTransfer implements FileTransferChmodInterface return TRUE; } return FALSE; - } else { + } + else { throw new FileTransferException('Cannot check @path.', NULL, array('@path' => $path)); } } diff --git a/includes/form.inc b/includes/form.inc index decca00..d929307 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -380,7 +380,7 @@ function form_state_defaults() { 'submitted' => FALSE, 'executed' => FALSE, 'programmed' => FALSE, - 'cache'=> FALSE, + 'cache' => FALSE, 'method' => 'post', 'groups' => array(), 'buttons' => array(), @@ -2412,7 +2412,7 @@ function form_type_token_value($element, $input = FALSE) { * array's keys to the element whose value you want to update. For instance, * if you want to update the value of $form['elem1']['elem2'], which should be * stored in $form_state['values']['elem1']['elem2'], you would set - * $element['#parents'] = array('elem1','elem2'). + * $element['#parents'] = array('elem1', 'elem2'). * @param $value * The new value for the form element. * @param $form_state @@ -2738,14 +2738,14 @@ function theme_radios($variables) { * Expand a password_confirm field into two text boxes. */ function form_process_password_confirm($element) { - $element['pass1'] = array( + $element['pass1'] = array( '#type' => 'password', '#title' => t('Password'), '#value' => empty($element['#value']) ? NULL : $element['#value']['pass1'], '#required' => $element['#required'], '#attributes' => array('class' => array('password-field')), ); - $element['pass2'] = array( + $element['pass2'] = array( '#type' => 'password', '#title' => t('Confirm password'), '#value' => empty($element['#value']) ? NULL : $element['#value']['pass2'], @@ -3152,11 +3152,11 @@ function theme_container($variables) { * @code * $options = array(); * $options[0]['title'] = "A red row" - * $options[0]['#attributes'] = array ('class' => array('red-row')); + * $options[0]['#attributes'] = array('class' => array('red-row')); * $options[1]['title'] = "A blue row" - * $options[1]['#attributes'] = array ('class' => array('blue-row')); + * $options[1]['#attributes'] = array('class' => array('blue-row')); * - * $form['myselector'] = array ( + * $form['myselector'] = array( * '#type' => 'tableselect', * '#title' => 'My Selector' * '#options' => $options, diff --git a/includes/install.core.inc b/includes/install.core.inc index 1040bf3..a9f476f 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -1106,7 +1106,7 @@ function install_select_profile_form($form, &$form_state, $profile_files) { ); } $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( + $form['actions']['submit'] = array( '#type' => 'submit', '#value' => st('Save and continue'), ); @@ -1255,7 +1255,7 @@ function install_select_locale_form($form, &$form_state, $locales, $profilename) ); } $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( + $form['actions']['submit'] = array( '#type' => 'submit', '#value' => st('Save and continue'), ); diff --git a/includes/install.inc b/includes/install.inc index 089cdee..8ffba35 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -410,7 +410,7 @@ abstract class DatabaseTasks { $message = ''; foreach ($this->results as $result => $success) { if (!$success) { - $message .= '' . $result . '
'; + $message .= '' . $result . '
'; } } if (!empty($message)) { @@ -561,7 +561,7 @@ abstract class DatabaseTasks { // Verify the database port. if (!empty($database['port']) && !is_numeric($database['port'])) { - $errors[$database['driver'] . '][advanced_options][port'] = st('Database port must be a number.'); + $errors[$database['driver'] . '][advanced_options][port'] = st('Database port must be a number.'); } return $errors; @@ -1045,7 +1045,7 @@ function st($string, array $args = array(), array $options = array()) { // with its name ending in {$install_state['parameters']['locale']}.po // This might or might not be the entire filename. It is also possible // that multiple files end with the same extension, even if unlikely. - $po_files = file_scan_directory('./profiles/' . $install_state['parameters']['profile'] . '/translations', '/'. $install_state['parameters']['locale'] .'\.po$/', array('recurse' => FALSE)); + $po_files = file_scan_directory('./profiles/' . $install_state['parameters']['profile'] . '/translations', '/' . $install_state['parameters']['locale'] . '\.po$/', array('recurse' => FALSE)); if (count($po_files)) { require_once DRUPAL_ROOT . '/includes/locale.inc'; foreach ($po_files as $po_file) { diff --git a/includes/mail.inc b/includes/mail.inc index 7272df9..df777a1 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -55,7 +55,7 @@ define('MAIL_LINE_ENDINGS', isset($_SERVER['WINDIR']) || strpos($_SERVER['SERVER * $data['user'] = $params['account']; * $options['language'] = $message['language']; * user_mail_tokens($variables, $data, $options); - * switch($key) { + * switch ($key) { * case 'notice': * $langcode = $message['language']->language; * $message['subject'] = t('Notification from !site', $variables, array('langcode' => $langcode)); @@ -179,7 +179,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N * DefaultMailSystem implementation. * * The selection of a particular implementation is controlled via the variable - * 'mail_system', which is a keyed array. The default implementation + * 'mail_system', which is a keyed array. The default implementation * is the class whose name is the value of 'default-system' key. A more specific * match first to key and then to module will be used in preference to the * default. To specificy a different class for all mail sent by one module, set @@ -288,7 +288,7 @@ interface MailSystemInterface { * E-mail bodies must be wrapped. You can use drupal_wrap_mail() for * smart plain text wrapping. * - headers: Associative array containing all additional mail headers not - * defined by one of the other parameters. PHP's mail() looks for Cc + * defined by one of the other parameters. PHP's mail() looks for Cc * and Bcc headers and sends the mail to addresses in these headers too. * * @return diff --git a/includes/menu.inc b/includes/menu.inc index 0e3f5b6..b48faef 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -305,7 +305,7 @@ define('MENU_MAX_DEPTH', 9); function menu_get_ancestors($parts) { $number_parts = count($parts); $ancestors = array(); - $length = $number_parts - 1; + $length = $number_parts - 1; $end = (1 << $number_parts) - 1; $masks = variable_get('menu_masks', array()); // Only examine patterns that actually exist as router items (the masks). @@ -3430,7 +3430,7 @@ function _menu_router_build($callbacks) { $parts[$k] = '%'; } else { - $fit |= 1 << ($slashes - $k); + $fit |= 1 << ($slashes - $k); } } if ($fit) { diff --git a/includes/pager.inc b/includes/pager.inc index 7a3a7be..e1bd386 100644 --- a/includes/pager.inc +++ b/includes/pager.inc @@ -9,7 +9,7 @@ /** * Query extender for pager queries. * - * This is the "default" pager mechanism. It creates a paged query with a fixed + * This is the "default" pager mechanism. It creates a paged query with a fixed * number of entries per page. */ class PagerDefault extends SelectQueryExtender { @@ -96,11 +96,11 @@ class PagerDefault extends SelectQueryExtender { /** * Specify the count query object to use for this pager. * - * You will rarely need to specify a count query directly. If not specified, + * You will rarely need to specify a count query directly. If not specified, * one is generated off of the pager query itself. * * @param SelectQueryInterface $query - * The count query object. It must return a single row with a single column, + * The count query object. It must return a single row with a single column, * which is the total number of records. */ public function setCountQuery(SelectQueryInterface $query) { @@ -131,7 +131,7 @@ class PagerDefault extends SelectQueryExtender { * The default if not specified is 10 items per page. * * @param $limit - * An integer specifying the number of elements per page. If passed a false + * An integer specifying the number of elements per page. If passed a false * value (FALSE, 0, NULL), the pager is disabled. */ public function limit($limit = 10) { @@ -143,8 +143,8 @@ class PagerDefault extends SelectQueryExtender { * Specify the element ID for this pager query. * * The element is used to differentiate different pager queries on the same - * page so that they may be operated independently. If you do not specify an - * element, every pager query on the page will get a unique element. If for + * page so that they may be operated independently. If you do not specify an + * element, every pager query on the page will get a unique element. If for * whatever reason you want to explicitly define an element for a given query, * you may do so here. * diff --git a/includes/password.inc b/includes/password.inc index a4b9633..7c97287 100644 --- a/includes/password.inc +++ b/includes/password.inc @@ -142,7 +142,7 @@ function _password_enforce_log2_boundaries($count_log2) { * @param $password * The plain-text password to hash. * @param $setting - * An existing hash or the output of _password_generate_salt(). Must be + * An existing hash or the output of _password_generate_salt(). Must be * at least 12 characters (the settings and salt). * * @return @@ -177,7 +177,7 @@ function _password_crypt($algo, $password, $setting) { } while (--$count); $len = strlen($hash); - $output = $setting . _password_base64_encode($hash, $len); + $output = $setting . _password_base64_encode($hash, $len); // _password_base64_encode() of a 16 byte MD5 will always be 22 characters. // _password_base64_encode() of a 64 byte sha512 will always be 86 characters. $expected = 12 + ceil((8 * $len) / 6); @@ -248,7 +248,7 @@ function user_check_password($password, $account) { case '$H$': // phpBB3 uses "$H$" for the same thing as "$P$". case '$P$': - // A phpass password generated using md5. This is an + // A phpass password generated using md5. This is an // imported password or from an earlier Drupal version. $hash = _password_crypt('md5', $password, $stored_hash); break; diff --git a/includes/stream_wrappers.inc b/includes/stream_wrappers.inc index 9a9b061..f2e313a 100644 --- a/includes/stream_wrappers.inc +++ b/includes/stream_wrappers.inc @@ -12,7 +12,7 @@ * * Note that PHP 5.2 fopen() only supports URIs of the form "scheme://target" * despite the fact that according to RFC 3986 a URI's scheme component - * delimiter is in general just ":", not "://". Because of this PHP limitation + * delimiter is in general just ":", not "://". Because of this PHP limitation * and for consistency Drupal will only accept URIs of form "scheme://target". * * @see http://www.faqs.org/rfcs/rfc3986.html diff --git a/includes/theme.inc b/includes/theme.inc index 3287073..437b03b 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -385,7 +385,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { foreach ($result as $hook => $info) { // When a theme or engine overrides a module's theme function // $result[$hook] will only contain key/value pairs for information being - // overridden. Pull the rest of the information from what was defined by + // overridden. Pull the rest of the information from what was defined by // an earlier hook. // Fill in the type and path of the module, theme, or engine that diff --git a/includes/update.inc b/includes/update.inc index cbee34e..a12341a 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -23,7 +23,7 @@ define('REQUIRED_D7_SCHEMA_VERSION', '7069'); */ function update_fix_compatibility() { $incompatible = array(); - $result = db_query("SELECT name, type, status FROM {system} WHERE status = 1 AND type IN ('module','theme')"); + $result = db_query("SELECT name, type, status FROM {system} WHERE status = 1 AND type IN ('module', 'theme')"); foreach ($result as $row) { if (update_check_incompatibility($row->name, $row->type)) { $incompatible[] = $row->name; diff --git a/includes/updater.inc b/includes/updater.inc index 363c6eb..92df8b3 100644 --- a/includes/updater.inc +++ b/includes/updater.inc @@ -127,7 +127,7 @@ class Updater { * * Since there is no enforcement of which info file is the project's "main" * info file, this will get one with the same name as the directory, or the - * first one it finds. Not ideal, but needs a larger solution. + * first one it finds. Not ideal, but needs a larger solution. * * @param string $directory * Directory to search in. diff --git a/misc/collapse.js b/misc/collapse.js index 1a98dc0..6189151 100644 --- a/misc/collapse.js +++ b/misc/collapse.js @@ -58,7 +58,7 @@ Drupal.behaviors.collapse = { $('fieldset.collapsible', context).once('collapse', function () { var $fieldset = $(this); // Expand fieldset if there are errors inside, or if it contains an - // element that is targeted by the uri fragment identifier. + // element that is targeted by the uri fragment identifier. var anchor = location.hash && location.hash != '#' ? ', ' + location.hash : ''; if ($('.error' + anchor, $fieldset).length) { $fieldset.removeClass('collapsed'); diff --git a/misc/tabledrag.js b/misc/tabledrag.js index b9b5822..301a2fa 100644 --- a/misc/tabledrag.js +++ b/misc/tabledrag.js @@ -797,8 +797,8 @@ Drupal.tableDrag.prototype.copyDragClasses = function (sourceRow, targetRow, gro }; Drupal.tableDrag.prototype.checkScroll = function (cursorY) { - var de = document.documentElement; - var b = document.body; + var de = document.documentElement; + var b = document.body; var windowHeight = this.windowHeight = window.innerHeight || (de.clientHeight && de.clientWidth != 0 ? de.clientHeight : b.offsetHeight); var scrollY = this.scrollY = (document.all ? (!de.scrollTop ? b.scrollTop : de.scrollTop) : (window.pageYOffset ? window.pageYOffset : window.scrollY)); diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test index 1ab12dc..2158711 100644 --- a/modules/aggregator/aggregator.test +++ b/modules/aggregator/aggregator.test @@ -371,7 +371,7 @@ class UpdateFeedTestCase extends AggregatorTestCase { // Get new feed data array and modify newly created feed. $edit = $this->getFeedEditArray(); - $edit['refresh'] = 1800; // Change refresh value. + $edit['refresh'] = 1800; // Change refresh value. if (isset($feed->{$same_field})) { $edit[$same_field] = $feed->{$same_field}; } diff --git a/modules/block/block.api.php b/modules/block/block.api.php index d33f594..98a1ab4 100644 --- a/modules/block/block.api.php +++ b/modules/block/block.api.php @@ -226,7 +226,8 @@ function hook_block_view($delta = '') { '#theme' => 'node_recent_block', '#nodes' => $nodes, ); - } else { + } + else { $block['content'] = t('No content available.'); } } diff --git a/modules/block/block.module b/modules/block/block.module index 86e1ca7..cbde7db 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -422,7 +422,7 @@ function _block_rehash($theme = NULL) { // {block}.pages is type 'text', so it cannot have a // default value, and not null, so we need to provide // value if the module did not. - $block['pages'] = ''; + $block['pages'] = ''; } // Make sure weight is set. if (!isset($block['weight'])) { @@ -523,7 +523,7 @@ function block_custom_block_form($edit = array()) { * @param $edit * Associative array of fields to save. Array keys: * - info: Block description. - * - body: Associative array of body value and format. Array keys: + * - body: Associative array of body value and format. Array keys: * - value: Block contents. * - format: Filter ID of the filter format for the body. * @param $delta diff --git a/modules/block/block.test b/modules/block/block.test index 2166687..0c3ad08 100644 --- a/modules/block/block.test +++ b/modules/block/block.test @@ -193,7 +193,7 @@ class BlockTestCase extends DrupalWebTestCase { } /** - * Test block visibility when using "pages" restriction but leaving + * Test block visibility when using "pages" restriction but leaving * "pages" textarea empty */ function testBlockVisibilityListedEmpty() { @@ -463,7 +463,7 @@ class BlockAdminThemeTestCase extends DrupalWebTestCase { } /** - * Check for the accessibility of the admin theme on the block admin page. + * Check for the accessibility of the admin theme on the block admin page. */ function testAdminTheme() { // Create administrative user. diff --git a/modules/book/book.module b/modules/book/book.module index 6e74d32..a0de155 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -1047,11 +1047,11 @@ function template_preprocess_book_navigation(&$variables) { * * This helper function recursively modifies the $toc array for each item in * $tree, ignoring items in the exclude array or at a depth greater than the - * limit. Truncates titles over thirty characters and appends an indentation + * limit. Truncates titles over thirty characters and appends an indentation * string incremented by depth. * * @param $tree - * The data structure of the book's menu tree. Includes hidden links. + * The data structure of the book's menu tree. Includes hidden links. * @param $indent * A string appended to each menu item title. Increments by '--' per depth * level. diff --git a/modules/color/color.module b/modules/color/color.module index 7665631..7eff863 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -244,11 +244,11 @@ function theme_color_scheme_form($variables) { $info = $form['info']['#value']; $path = drupal_get_path('theme', $theme) . '/'; drupal_add_css($path . $info['preview_css']); - + $preview_js_path = isset($info['preview_js']) ? $path . $info['preview_js'] : drupal_get_path('module', 'color') . '/' . 'preview.js'; // Add the JS at a weight below color.js. drupal_add_js($preview_js_path, array('weight' => -1)); - + $output = ''; $output .= '