diff --git a/authorize.php b/authorize.php index d9b437540dc3a21c76fbb9aeef0db6cc7d013d75..68e7879ea719bf6d5587f958f318d45671b962ad 100644 --- a/authorize.php +++ b/authorize.php @@ -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']; diff --git a/includes/authorize.inc b/includes/authorize.inc index aa02489fa80da81641ea2265f5a34f37f248f2ee..39a7125e69c1f07eb296e28e251b19e381d0c943 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 218d10865c68fe598d9467d4dbb90a24bdf6b33c..a42e377cbaf3f0ab76cbc5cd43fe470b57a2fa1f 100644 --- a/includes/database/pgsql/database.inc +++ b/includes/database/pgsql/database.inc @@ -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 diff --git a/includes/database/pgsql/install.inc b/includes/database/pgsql/install.inc index 72f2865d301e70fcb2733aad8411cd06e2d2bafc..2223781dcd98a7c00c91c729c046c0b2ae5e7499 100644 --- a/includes/database/pgsql/install.inc +++ b/includes/database/pgsql/install.inc @@ -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.'; diff --git a/includes/filetransfer/local.inc b/includes/filetransfer/local.inc index facba2c0d24b92654c96f7fc37835dd255b6ef07..14e246671f6511e1a1576b6501891a0d59ac9e78 100644 --- a/includes/filetransfer/local.inc +++ b/includes/filetransfer/local.inc @@ -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); } diff --git a/includes/filetransfer/ssh.inc b/includes/filetransfer/ssh.inc index 4ba03c1ae18320a2fa9a162a5ec2aa6ada572449..f0bae72d0c8f6ced6137ebcf5414602208151f25 100644 --- a/includes/filetransfer/ssh.inc +++ b/includes/filetransfer/ssh.inc @@ -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. */ diff --git a/modules/aggregator/aggregator.parser.inc b/modules/aggregator/aggregator.parser.inc index 4d6f4fc4743918aa2024a485bc4e788606ada989..9757da1fe33a33bdf1cf6b0c2ec6a5d1fa6680d2 100644 --- a/modules/aggregator/aggregator.parser.inc +++ b/modules/aggregator/aggregator.parser.inc @@ -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. diff --git a/modules/block/block.tpl.php b/modules/block/block.tpl.php index ad09a1ea089e11cef7391ced145d6245bd539b1b..d4ebf89cc281c6d474f9a4c04bbc39fb8d98f1ac 100644 --- a/modules/block/block.tpl.php +++ b/modules/block/block.tpl.php @@ -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> diff --git a/modules/book/book-all-books-block.tpl.php b/modules/book/book-all-books-block.tpl.php index 5a42c98357bbe565c025639473033d51f0ef8311..7006307d20d529b73eec390566f8173b9dd7e32a 100644 --- a/modules/book/book-all-books-block.tpl.php +++ b/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. */ ?> <?php foreach ($book_menus as $book_id => $menu) : ?> diff --git a/modules/color/color.module b/modules/color/color.module index 93b733a135159908da6ffb58aec33689bd71ed0e..ce990d19024b15482b7266e99405143b5a90c13d 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -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>'; diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc index 69118f4e6f72586eed3ad9ac1e36b7869d365988..2153c271457e7c3e20478c405bcdb47b0d58e607 100644 --- a/modules/comment/comment.admin.inc +++ b/modules/comment/comment.admin.inc @@ -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 diff --git a/modules/comment/comment.test b/modules/comment/comment.test index 14b4e1081547956640d9c7c1e0a1e0731911c2c2..88953803621f238ee75629c2e7d5311515e943f0 100644 --- a/modules/comment/comment.test +++ b/modules/comment/comment.test @@ -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 +} diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module index 0a47107e48c35f70985a02834ec30a0a455386e9..a36785f711ab49de17819da64fbefe0719108bcc 100644 --- a/modules/dblog/dblog.module +++ b/modules/dblog/dblog.module @@ -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>'; } diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index 281245048ee2a854a3ce099b1f2c2d7342281746..9c2e558315320f3d498a6b4c25090168014b48cb 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -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), diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info index 6e8bb24ee1e57aeee400ed093e73905f34c070c8..9d3156624e6af18e8b7de5a977f69d79169bbd12 100644 --- a/modules/field/modules/text/text.info +++ b/modules/field/modules/text/text.info @@ -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 diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test index 94c94afd7fd555b2605bc8ff508bb6b575fe4237..3cfd3f7974d4828fb439e1a4865a9ddb908a3141 100644 --- a/modules/field/tests/field.test +++ b/modules/field/tests/field.test @@ -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']; diff --git a/modules/help/help.api.php b/modules/help/help.api.php index cc555fdd4719e1768482312de25e1867ce190899..59cd8eb14945e48e64fd038aca91beced08b7905 100644 --- a/modules/help/help.api.php +++ b/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 a/modules/image/image.field.inc b/modules/image/image.field.inc index 39fcf2c1047c75ab050397e5cd7cde6339a2d896..6417d6892c412f434c917bac463777db7b44ddb8 100644 --- a/modules/image/image.field.inc +++ b/modules/image/image.field.inc @@ -506,4 +506,4 @@ function theme_image_formatter($variables) { } return $output; -} \ No newline at end of file +} diff --git a/modules/locale/locale.test b/modules/locale/locale.test index 91d91e7a4b758e458e6582a4f870a04011eb9278..4bfb09cc7a59eb7a7eeb46dcfcc00a78fc53ef6a 100644 --- a/modules/locale/locale.test +++ b/modules/locale/locale.test @@ -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 diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index aaedc5ac440083df38bd1686803e83a2cf1d367b..1efa9db7f900d2cd0fe9d15a8808b9517de0d196 100644 --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -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( diff --git a/modules/menu/menu.api.php b/modules/menu/menu.api.php index b8f4335e2810a522c4d267157e887a209a8bed09..3bd18224074d892c5cb1780746f5736cf58ca9df 100644 --- a/modules/menu/menu.api.php +++ b/modules/menu/menu.api.php @@ -165,7 +165,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. @@ -192,7 +192,7 @@ * - "file path": The path to the directory containing the file specified in * "file". This defaults to the path to the module implementing the hook. * - "load arguments": An array of arguments to be passed to each of the - * wildcard object loaders in the path, after the path argument itself. + * wildcard object loaders in the path, after the path argument itself. * For example, if a module registers path node/%node/revisions/%/view * with load arguments set to array(3), the '%node' in the path indicates * that the loader function node_load() will be called with the second diff --git a/modules/node/node.test b/modules/node/node.test index 8ef4e8eb8beed3d974c35911a7084f244cae1dd8..b52e326d7944e880c089067b03fd97b8c89be17a 100644 --- a/modules/node/node.test +++ b/modules/node/node.test @@ -1434,4 +1434,4 @@ class NodeBuildContent extends DrupalWebTestCase { // If the property doesn't exist it means the node->content was rebuilt. $this->assertFalse(isset($content['test_content_property']), t('Node content was emptied prior to being built.')); } -} \ No newline at end of file +} diff --git a/modules/openid/openid.css b/modules/openid/openid.css index c752cc2606cd803279af5160b21b559dd64d2757..63d1c01c6c8a4791a3e0843c73507f160dbcb29d 100644 --- a/modules/openid/openid.css +++ b/modules/openid/openid.css @@ -37,4 +37,4 @@ html.js #user-login li.openid-link { #user-login li.openid-link a { background: transparent url("login-bg.png") no-repeat 0 2px; padding: 0 20px; -} \ No newline at end of file +} diff --git a/modules/openid/openid.pages.inc b/modules/openid/openid.pages.inc index eb8da817c1151fdb23620df6ba483012fbe4c009..87a4c89a36cd4351ec93c1ac1dc2800f36181e5e 100644 --- a/modules/openid/openid.pages.inc +++ b/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 a/modules/openid/openid.test b/modules/openid/openid.test index 3cdc88e63c734f798aa50b765cce2ce7a0454875..17e29c5405de7eb18ae8d44df08e17d12f4ecef6 100644 --- a/modules/openid/openid.test +++ b/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->assertLink('john', 0, 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 a/modules/openid/xrds.inc b/modules/openid/xrds.inc index cd862cdec180ebcff6fccdf9a25b8c324f9d0be4..8470997dba44e3b1463921aa7eb0ef0c7da8b056 100644 --- a/modules/openid/xrds.inc +++ b/modules/openid/xrds.inc @@ -79,4 +79,4 @@ function _xrds_strip_namespace($name) { } return $name; -} \ No newline at end of file +} diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index ff346a76dce67e99b347d66580e3d77d9521538e..ef74e750665e80782e3a304bdc443c8e3021899f 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -277,7 +277,7 @@ Drupal.overlay.load = function (url) { self.$iframeDocument = null; self.$iframeBody = null; - // Reset lastHeight so the overlay fits user's viewport and the loading + // Reset lastHeight so the overlay fits user's viewport and the loading // spinner is centered. self.lastHeight = 0; self.outerResize(); @@ -292,7 +292,7 @@ Drupal.overlay.load = function (url) { self.$dialogTitlebar.find('ul').remove(); // While the overlay is loading, we remove the loaded class from the dialog. - // After the loading is finished, the loaded class is added back. The loaded + // After the loading is finished, the loaded class is added back. The loaded // class is being used to hide the iframe while loading. // @see overlay-parent.css .overlay-loaded #overlay-element self.$dialog.removeClass('overlay-loaded'); @@ -408,7 +408,7 @@ Drupal.overlay.bindChild = function (iframeWindow, isClosing) { // Unbind the keydown and keypress handlers installed by ui.dialog because // they interfere with use of browser's keyboard hotkeys like CTRL+w. - // This may cause problems when using modules that implement keydown or + // This may cause problems when using modules that implement keydown or // keypress handlers as they aren't blocked when overlay is open. $(document).unbind('keydown.dialog-overlay keypress.dialog-overlay'); diff --git a/modules/profile/profile.js b/modules/profile/profile.js index 9f52559f5a8b54d0368208b043c98ed201fb0c72..1a268ed19340081dd45110957bc812dd08528580 100644 --- a/modules/profile/profile.js +++ b/modules/profile/profile.js @@ -56,4 +56,4 @@ Drupal.behaviors.profileDrag = { } }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/rdf/rdf.test b/modules/rdf/rdf.test index d94421fe783c552024ef78f50557d44b3d23d28f..9f2a0fab52f9064164e643851f1b99f8630e8c4c 100644 --- a/modules/rdf/rdf.test +++ b/modules/rdf/rdf.test @@ -407,7 +407,7 @@ class RdfTrackerAttributesTestCase extends DrupalWebTestCase { // Tests whether the property has been set for number of comments. $tracker_replies = $this->xpath("//tr[@about='$url']//td[contains(@property, 'sioc:num_replies') and contains(@content, '1')]"); $this->assertTrue($tracker_replies, t('Num replies property and content attributes found on @user content.', array('@user'=> $user))); - + // Need to query database directly to obtain last_activity_date because // it cannot be accessed via node_load(). $result = db_query('SELECT t.changed FROM {tracker_node} t WHERE t.nid = (:nid)', array(':nid' => $node->nid)); diff --git a/modules/search/search-results.tpl.php b/modules/search/search-results.tpl.php index 1d347f669da200e919872e66b93717ba7be34907..9b183f1a55f3cbfe4fd411cb609d7b0900086d6e 100644 --- a/modules/search/search-results.tpl.php +++ b/modules/search/search-results.tpl.php @@ -24,7 +24,7 @@ <?php if ($search_results) : ?> <h2><?php print t('Search results');?></h2> <dl class="search-results <?php print $type; ?>-results"> - <?php print $search_results; ?> + <?php print $search_results; ?> </dl> <?php print $pager; ?> <?php else : ?> diff --git a/modules/search/search.admin.inc b/modules/search/search.admin.inc index 4e2386accc29a0abf27a478c27308e82bc8574f1..7b7f2fb1f02e5f3972054a4796dbd2f70c797506 100644 --- a/modules/search/search.admin.inc +++ b/modules/search/search.admin.inc @@ -164,4 +164,4 @@ function search_admin_settings_submit($form, &$form_state) { function search_admin_reindex_submit($form, &$form_state) { // send the user to the confirmation page $form_state['redirect'] = 'admin/config/search/settings/reindex'; -} \ No newline at end of file +} diff --git a/modules/search/search.api.php b/modules/search/search.api.php index 1e1e99b6564c9e9b22b66454ebb2edbc103ff58e..a9327ac2c46792dfe4333ef3b61344fc74683d9c 100644 --- a/modules/search/search.api.php +++ b/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 @@ -206,7 +206,7 @@ function hook_search_execute($keys = NULL) { return $results; } -/** +/** * Override the rendering of search results. * * A module that implements hook_search() to define a type of search diff --git a/modules/search/search.module b/modules/search/search.module index a7bbd1bd2884f6f87b5957ea81405443e21a6103..a8725c5ee3b95fddfeedd3b84f3c47321ea5274a 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -33,13 +33,13 @@ */ define('PREG_CLASS_SEARCH_EXCLUDE', '\x{0}-\x{2F}\x{3A}-\x{40}\x{5B}-\x{60}\x{7B}-\x{A9}\x{AB}-\x{B1}\x{B4}' . - '\x{B6}-\x{B8}\x{BB}\x{BF}\x{D7}\x{F7}\x{2C2}-\x{2C5}\x{2D2}-\x{2DF}' . + '\x{B6}-\x{B8}\x{BB}\x{BF}\x{D7}\x{F7}\x{2C2}-\x{2C5}\x{2D2}-\x{2DF}' . '\x{2E5}-\x{2EB}\x{2ED}\x{2EF}-\x{2FF}\x{375}\x{37E}-\x{385}\x{387}\x{3F6}' . - '\x{482}\x{55A}-\x{55F}\x{589}-\x{58A}\x{5BE}\x{5C0}\x{5C3}\x{5C6}' . - '\x{5F3}-\x{60F}\x{61B}-\x{61F}\x{66A}-\x{66D}\x{6D4}\x{6DD}\x{6E9}' . - '\x{6FD}-\x{6FE}\x{700}-\x{70F}\x{7F6}-\x{7F9}\x{830}-\x{83E}' . - '\x{964}-\x{965}\x{970}\x{9F2}-\x{9F3}\x{9FA}-\x{9FB}\x{AF1}\x{B70}' . - '\x{BF3}-\x{BFA}\x{C7F}\x{CF1}-\x{CF2}\x{D79}\x{DF4}\x{E3F}\x{E4F}' . + '\x{482}\x{55A}-\x{55F}\x{589}-\x{58A}\x{5BE}\x{5C0}\x{5C3}\x{5C6}' . + '\x{5F3}-\x{60F}\x{61B}-\x{61F}\x{66A}-\x{66D}\x{6D4}\x{6DD}\x{6E9}' . + '\x{6FD}-\x{6FE}\x{700}-\x{70F}\x{7F6}-\x{7F9}\x{830}-\x{83E}' . + '\x{964}-\x{965}\x{970}\x{9F2}-\x{9F3}\x{9FA}-\x{9FB}\x{AF1}\x{B70}' . + '\x{BF3}-\x{BFA}\x{C7F}\x{CF1}-\x{CF2}\x{D79}\x{DF4}\x{E3F}\x{E4F}' . '\x{E5A}-\x{E5B}\x{F01}-\x{F17}\x{F1A}-\x{F1F}\x{F34}\x{F36}\x{F38}' . '\x{F3A}-\x{F3D}\x{F85}\x{FBE}-\x{FC5}\x{FC7}-\x{FD8}\x{104A}-\x{104F}' . '\x{109E}-\x{109F}\x{10FB}\x{1360}-\x{1368}\x{1390}-\x{1399}\x{1400}' . diff --git a/modules/search/search.test b/modules/search/search.test index 7e650120bec68fddad174fcceb03ea35e9977a13..21f788f915e2cbaa6461e0bbb6b9ba66c23a4b45 100644 --- a/modules/search/search.test +++ b/modules/search/search.test @@ -171,7 +171,7 @@ class SearchMatchTestCase extends DrupalWebTestCase { $this->_testQueryMatching($query, $set, $results); $this->_testQueryScores($query, $set, $results); } - + // These queries are run against the third index type, SEARCH_TYPE_JPN. $queries = array( // Simple AND queries. @@ -193,7 +193,7 @@ class SearchMatchTestCase extends DrupalWebTestCase { $set = $result ? $result->fetchAll() : array(); $this->_testQueryMatching($query, $set, $results); $this->_testQueryScores($query, $set, $results); - } + } } /** @@ -599,4 +599,3 @@ class SearchSimplifyTestCase extends DrupalWebTestCase { $this->assertIdentical(' ', search_simplify($string), t('Search simplify works for ASCII control characters.')); } } - \ No newline at end of file diff --git a/modules/search/tests/UnicodeTest.txt b/modules/search/tests/UnicodeTest.txt index af8a65c7ff736555765e6080a175fa4167b244e7..08289179a2705801dc251713d19f9aef63e430b5 100644 --- a/modules/search/tests/UnicodeTest.txt +++ b/modules/search/tests/UnicodeTest.txt @@ -133,7 +133,7 @@ abcdefghijklmnopqrstuvwxyz áá‚áƒá„á…á†á‡áˆá‰áŠá‹áŒááŽááá‘á’á“á”á•á–á—á˜á™ášá›áœáážáŸá á¡á¢á£á¤á¥á¦á§á¨á©áªá«á¬áá®á¯á°á±á²á³á´áµá¶á·á¸á¹áºá»á¼á½á¾á¿á‘€á‘ᑂᑃᑄᑅᑆᑇᑈᑉᑊᑋᑌá‘á‘Žá‘á‘ᑑᑒᑓᑔᑕᑖᑗᑘᑙᑚᑛᑜá‘ᑞᑟᑠᑡᑢᑣᑤᑥᑦᑧᑨᑩᑪᑫᑬá‘ᑮᑯᑰᑱᑲᑳᑴᑵᑶᑷᑸᑹᑺᑻᑼᑽᑾᑿᒀá’ᒂᒃᒄᒅᒆᒇᒈᒉᒊᒋᒌá’á’Žá’á’ᒑᒒᒓᒔᒕᒖᒗᒘᒙᒚᒛᒜá’ᒞᒟᒠᒡᒢᒣᒤᒥᒦᒧᒨᒩᒪᒫᒬá’ᒮᒯᒰᒱᒲᒳᒴᒵᒶᒷᒸᒹᒺᒻᒼᒽᒾᒿᓀá“ᓂᓃᓄᓅᓆᓇᓈᓉᓊᓋᓌá“á“Žá“á“ᓑᓒᓓᓔᓕᓖᓗᓘᓙᓚᓛᓜá“ᓞᓟᓠᓡᓢᓣᓤᓥᓦᓧᓨᓩᓪᓫᓬá“ᓮᓯᓰᓱᓲᓳᓴᓵᓶᓷᓸᓹᓺᓻᓼᓽᓾᓿᔀá”ᔂᔃᔄᔅᔆᔇᔈᔉᔊᔋᔌá”ᔎá”á”ᔑᔒᔓᔔᔕᔖᔗᔘᔙᔚᔛᔜá”ᔞᔟᔠᔡᔢᔣᔤᔥᔦᔧᔨᔩᔪᔫᔬá”ᔮᔯᔰᔱᔲᔳᔴᔵᔶᔷᔸᔹᔺᔻᔼᔽᔾᔿᕀá•á•‚ᕃᕄᕅᕆᕇᕈᕉᕊᕋᕌá•á•Žá•á•á•‘ᕒᕓᕔᕕᕖᕗᕘᕙᕚᕛᕜá•á•žá•Ÿá• ᕡᕢᕣᕤᕥᕦᕧᕨᕩᕪᕫᕬá•á•®á•¯á•°á•±á•²á•³á•´á•µá•¶á•·á•¸á•¹á•ºá•»á•¼á•½á•¾á•¿á–€á–ᖂᖃᖄᖅᖆᖇᖈᖉᖊᖋᖌá–á–Žá–á–ᖑᖒᖓᖔᖕᖖᖗᖘᖙᖚᖛᖜá–ᖞᖟᖠᖡᖢᖣᖤᖥᖦᖧᖨᖩᖪᖫᖬá–ᖮᖯᖰᖱᖲᖳᖴᖵᖶᖷᖸᖹᖺᖻᖼᖽᖾᖿᗀá—ᗂᗃᗄᗅᗆᗇᗈᗉᗊᗋᗌá—á—Žá—á—ᗑᗒᗓᗔᗕᗖᗗᗘᗙᗚᗛᗜá—ᗞᗟᗠᗡᗢᗣᗤᗥᗦᗧᗨᗩᗪᗫᗬá—ᗮᗯᗰᗱᗲᗳᗴᗵᗶᗷᗸᗹᗺᗻᗼᗽᗾᗿᘀá˜á˜‚ᘃᘄᘅᘆᘇᘈᘉᘊᘋᘌá˜á˜Žá˜á˜á˜‘ᘒᘓᘔᘕᘖᘗᘘᘙᘚᘛᘜá˜á˜žá˜Ÿá˜ ᘡᘢᘣᘤᘥᘦᘧᘨᘩᘪᘫᘬá˜á˜®á˜¯á˜°á˜±á˜²á˜³á˜´á˜µá˜¶á˜·á˜¸á˜¹á˜ºá˜»á˜¼á˜½á˜¾á˜¿á™€á™á™‚ᙃᙄᙅᙆᙇᙈᙉᙊᙋᙌá™á™Žá™á™á™‘ᙒᙓᙔᙕᙖᙗᙘᙙᙚᙛᙜá™á™žá™Ÿá™ ᙡᙢᙣᙤᙥᙦᙧᙨᙩᙪᙫᙬ á™á™® ᙯᙰᙱᙲᙳᙴᙵᙶᙷᙸᙹᙺᙻᙼᙽᙾᙿ -  + ášáš‚ᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌášášŽášášáš‘ᚒᚓᚔᚕᚖᚗᚘᚙᚚ ᚛᚜ ᚠᚡᚢᚣᚤᚥᚦᚧᚨᚩᚪᚫᚬášáš®áš¯áš°áš±áš²áš³áš´ášµáš¶áš·áš¸áš¹ášºáš»áš¼áš½áš¾áš¿á›€á›á›‚ᛃᛄᛅᛆᛇᛈᛉᛊᛋᛌá›á›Žá›á›á›‘ᛒᛓᛔᛕᛖᛗᛘᛙᛚᛛᛜá›á›žá›Ÿá› ᛡᛢᛣᛤᛥᛦᛧᛨᛩᛪ @@ -149,7 +149,7 @@ abcdefghijklmnopqrstuvwxyz ៜáŸáŸ ១២៣៤៥៦៧៨៩៰៱៲៳៴៵៶៷៸៹ á €á á ‚á ƒá „á …á †á ‡á ˆá ‰á Š á ‹á Œá -á Ž + á á ‘á ’á “á ”á •á –á —á ˜á ™á á ¡á ¢á £á ¤á ¥á ¦á §á ¨á ©á ªá «á ¬á á ®á ¯á °á ±á ²á ³á ´á µá ¶á ·á ¸á ¹á ºá »á ¼á ½á ¾á ¿á¡€á¡á¡‚ᡃᡄᡅᡆᡇᡈᡉᡊᡋᡌá¡á¡Žá¡á¡á¡‘ᡒᡓᡔᡕᡖᡗᡘᡙᡚᡛᡜá¡á¡žá¡Ÿá¡ ᡡᡢᡣᡤᡥᡦᡧᡨᡩᡪᡫᡬá¡á¡®á¡¯á¡°á¡±á¡²á¡³á¡´á¡µá¡¶á¡·á¢€á¢á¢‚ᢃᢄᢅᢆᢇᢈᢉᢊᢋᢌá¢á¢Žá¢á¢á¢‘ᢒᢓᢔᢕᢖᢗᢘᢙᢚᢛᢜá¢á¢žá¢Ÿá¢ ᢡᢢᢣᢤᢥᢦᢧᢨᢩᢪᢰᢱᢲᢳᢴᢵᢶᢷᢸᢹᢺᢻᢼᢽᢾᢿᣀá£á£‚ᣃᣄᣅᣆᣇᣈᣉᣊᣋᣌá£á£Žá£á£á£‘ᣒᣓᣔᣕᣖᣗᣘᣙᣚᣛᣜá£á£žá£Ÿá£ ᣡᣢᣣᣤᣥᣦᣧᣨᣩᣪᣫᣬá£á£®á£¯á£°á£±á£²á£³á£´á£µá¤€á¤á¤‚ᤃᤄᤅᤆᤇᤈᤉᤊᤋᤌá¤á¤Žá¤á¤á¤‘ᤒᤓᤔᤕᤖᤗᤘᤙᤚᤛᤜᤠᤡᤢᤣᤤᤥᤦᤧᤨᤩᤪᤫᤰᤱᤲᤳᤴᤵᤶᤷᤸ᤻᤹᤺ ᥀᥄᥅ ᥆᥇᥈᥉᥊᥋᥌á¥á¥Žá¥á¥á¥‘ᥒᥓᥔᥕᥖᥗᥘᥙᥚᥛᥜá¥á¥žá¥Ÿá¥ ᥡᥢᥣᥤᥥᥦᥧᥨᥩᥪᥫᥬá¥á¥°á¥±á¥²á¥³á¥´á¦€á¦á¦‚ᦃᦄᦅᦆᦇᦈᦉᦊᦋᦌá¦á¦Žá¦á¦á¦‘ᦒᦓᦔᦕᦖᦗᦘᦙᦚᦛᦜá¦á¦žá¦Ÿá¦ ᦡᦢᦣᦤᦥᦦᦧᦨᦩᦪᦫᦰᦱᦲᦳᦴᦵᦶᦷᦸᦹᦺᦻᦼᦽᦾᦿᧀá§á§‚ᧃᧄᧅᧆᧇᧈᧉá§á§‘᧒᧓᧔᧕᧖᧗᧘᧙᧚ @@ -330,4 +330,4 @@ abcdefghijklmnopqrstuvwxyz {|ï½ï½žï½Ÿï½ 。「」、・ ヲァィゥェォャï½ï½®ï½¯ï½°ï½±ï½²ï½³ï½´ï½µï½¶ï½·ï½¸ï½¹ï½ºï½»ï½¼ï½½ï½¾ï½¿ï¾€ï¾ï¾‚テトナニヌネノハヒフï¾ï¾Žï¾ï¾ï¾‘メモヤユヨラリルレロワï¾ï¾žï¾Ÿï¾ ᄀᄁᆪᄂᆬᆭᄃᄄᄅᆰᆱᆲï¾ï¾®ï¾¯ï¾°ï¾±ï¾²ï¾³ï¾´ï¾µï¾¶ï¾·ï¾¸ï¾¹ï¾ºï¾»ï¾¼ï¾½ï¾¾ï¿‚ᅢᅣᅤᅥᅦᅧᅨᅩï¿ï¿Žï¿ï¿’ᅮᅯᅰᅱᅲᅳᅴᅵ ï¿ ï¿¡ï¿¢ï¿£ï¿¤ï¿¥ï¿¦ï¿¨ï¿©ï¿ªï¿«ï¿¬ï¿ï¿®ï¿¹ï¿ºï¿»ï¿¼ï¿½ -ð€€ \ No newline at end of file +ð€€ diff --git a/modules/shortcut/shortcut.admin.inc b/modules/shortcut/shortcut.admin.inc index 65add1b0487e39faa728b55c4a0dff22073a3b51..522b03ba69d68f669773462586c5f4e43e538e18 100644 --- a/modules/shortcut/shortcut.admin.inc +++ b/modules/shortcut/shortcut.admin.inc @@ -80,7 +80,7 @@ function shortcut_set_switch($form, &$form_state, $account = NULL) { $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions'))); $form['actions']['submit'] = array( - '#type' => 'submit', + '#type' => 'submit', '#value' => t('Save configuration'), ); @@ -186,7 +186,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'); } @@ -198,7 +198,7 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) { $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions'))); $form['actions']['submit'] = array( - '#type' => 'submit', + '#type' => 'submit', '#value' => t('Save Changes'), ); diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module index 0fd34b1d136c31fcc36a0a377ce6230d884a2237..b4a1ed1bc565e20e8956089cc2bd58327c355525 100644 --- a/modules/shortcut/shortcut.module +++ b/modules/shortcut/shortcut.module @@ -399,7 +399,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 a/modules/simpletest/tests/actions.test b/modules/simpletest/tests/actions.test index 4eeb70390fe779d9ecc89c637077cf46d4aeaf48..9c36d0e2fe118ff0fe2564656e355dd442bb8dcc 100644 --- a/modules/simpletest/tests/actions.test +++ b/modules/simpletest/tests/actions.test @@ -104,7 +104,7 @@ class ActionLoopTestCase extends DrupalWebTestCase { /** * Create an infinite loop by causing a watchdog message to be set, - * which causes the actions to be triggered again, up to actions_max_stack + * which causes the actions to be triggered again, up to actions_max_stack * times. */ protected function triggerActions() { diff --git a/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test index a02d34c7a6d53a7b1658cdaef2b7379bbf191d23..0a165b5e157d7b4a4e3d082b8a7539872f7bf719 100644 --- a/modules/simpletest/tests/bootstrap.test +++ b/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 a/modules/simpletest/tests/common_test_info.txt b/modules/simpletest/tests/common_test_info.txt index 5dff07dd1e594bb47ac56b4837a0df426e3388e8..8ff8bd553fcf01ccb2a92d66087c6f72c76aa6ed 100644 --- a/modules/simpletest/tests/common_test_info.txt +++ b/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 a/modules/simpletest/tests/database_test.module b/modules/simpletest/tests/database_test.module index 2aaa14824e5e19e01a27b7eaa85280603e771f29..ea94601e3c47cccefe6d9d5300ea365cd86a4882 100644 --- a/modules/simpletest/tests/database_test.module +++ b/modules/simpletest/tests/database_test.module @@ -190,4 +190,4 @@ function database_test_tablesort_first() { 'tasks' => $tasks, )); exit; -} \ No newline at end of file +} diff --git a/modules/simpletest/tests/module_test.module b/modules/simpletest/tests/module_test.module index 498865ff41b43de77896e7d65badfac73d433e78..939f6e63eb70e093ebe042b7468dee3a5c168529 100644 --- a/modules/simpletest/tests/module_test.module +++ b/modules/simpletest/tests/module_test.module @@ -12,7 +12,7 @@ function module_test_permission() { /** * Implements hook_system_info_alter(). - * + * * Manipulate module dependencies to test dependency chains. */ function module_test_system_info_alter(&$info, $file, $type) { @@ -36,4 +36,4 @@ function module_test_system_info_alter(&$info, $file, $type) { $info['dependencies'][] = 'php'; } } -} \ No newline at end of file +} diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test index e8d0ae8ce8ce1a47ad1aeff207bde7e543e6c10b..cd312f679644b71fcef718e5a7433aeb9d54d6e0 100644 --- a/modules/statistics/statistics.test +++ b/modules/statistics/statistics.test @@ -44,7 +44,7 @@ class StatisticsReportsTestCase extends StatisticsTestCase { 'group' => 'Statistics' ); } - + /** * Verifies that 'Recent hits' renders properly and displays the added hit. */ @@ -179,7 +179,7 @@ class StatisticsBlockVisitorsTestCase extends StatisticsTestCase { class StatisticsAdminTestCase extends DrupalWebTestCase { protected $privileged_user; protected $test_node; - + public static function getInfo() { return array( 'name' => 'Test statistics admin.', @@ -218,7 +218,7 @@ class StatisticsAdminTestCase extends DrupalWebTestCase { $this->drupalGet('admin/reports/pages'); $this->assertText('node/1', t('Test node found.')); - // Hit the node again (the counter is incremented after the hit, so + // Hit the node again (the counter is incremented after the hit, so // "1 read" will actually be shown when the node is hit the second time). $this->drupalGet('node/' . $this->test_node->nid); $this->assertText('1 read', t('Node is read once.')); @@ -298,7 +298,7 @@ class StatisticsAdminTestCase extends DrupalWebTestCase { // statistics_cron will subtract the statistics_flush_accesslog_timer // variable from REQUEST_TIME in the delete query, so wait two secs here to // make sure the access log will be flushed for the node just hit. - sleep(2); + sleep(2); $this->cronRun(); $this->drupalGet('admin/reports/pages'); diff --git a/modules/system/image.gd.inc b/modules/system/image.gd.inc index 18ca62239eaefc9ebfdc3b30e4042fd11c75443e..28b1a3e9c2a5d952978daeba505899a35a227b94 100644 --- a/modules/system/image.gd.inc +++ b/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 a/modules/system/page.tpl.php b/modules/system/page.tpl.php index aa9f5ecd372f1e968237199532cf2020ac75d552..2577f190af17ca8d53eeb345bf6140fac97fa341 100644 --- a/modules/system/page.tpl.php +++ b/modules/system/page.tpl.php @@ -61,7 +61,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 a/modules/system/system.api.php b/modules/system/system.api.php index eefafdd74b5ff268612f8e6bcc185f8767f4a798..c18058c4dee1ba363c86135fa1f24057c42d9f1d 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -98,8 +98,8 @@ function hook_hook_info() { * Keys are bundles machine names, as found in the objects' 'bundle' * property (defined in the 'object keys' entry above). Elements: * - label: The human-readable name of the bundle. - * - admin: An array of information that allows Field UI pages to attach - * themselves to the existing administration pages for the bundle. + * - admin: An array of information that allows Field UI pages to attach + * themselves to the existing administration pages for the bundle. * Elements: * - path: the path of the bundle's main administration page, as defined * in hook_menu(). If the path includes a placeholder for the bundle, diff --git a/modules/system/system.install b/modules/system/system.install index 52d51d320bf1388aab852504dac327e91c848690..5d1f63bf605d9528e9efe5ea6d6cdb945afc38eb 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -94,7 +94,7 @@ function system_requirements($phase) { else { $requirements['php_register_globals']['value'] = $t('Disabled'); } - + // Test PDO library availability. $requirements['pdo'] = array( 'title' => $t('PDO library'), diff --git a/modules/system/system.tar.inc b/modules/system/system.tar.inc index 5f1587d701ee8c912bec9dfd895bad4091068fc6..e8ae2517f184b1da886233299262302d447be391 100644 --- a/modules/system/system.tar.inc +++ b/modules/system/system.tar.inc @@ -51,7 +51,7 @@ * @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 a/modules/system/system.test b/modules/system/system.test index fada5816b217e7de12c5bd4d6cf5886d32c7376a..3d186a6225ea5683d9d915916c92f5440b6cccc9 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -1244,7 +1244,7 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase { $this->drupalPost('admin/appearance/settings', $edit, t('Save configuration')); $this->drupalGet('node'); $this->assertRaw($file->uri, t('Logo path successfully changed.')); - + // Upload a file to use for the logo. $file = current($this->drupalGetTestFiles('image')); $edit = array( diff --git a/modules/system/system.tokens.inc b/modules/system/system.tokens.inc index 6d891202137b7e98cbc88415752950e0ea80bc8c..e86bf84907792624ee30c935833ece10c0f56cc4 100644 --- a/modules/system/system.tokens.inc +++ b/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('<front>', $url_options)); + $replacements[$original] = preg_replace('!^https?://!', '', url('<front>', $url_options)); break; case 'login-url': diff --git a/modules/system/system.updater.inc b/modules/system/system.updater.inc index da0aa4f0d696d34a461c6ace6d5a998e3b1fbd71..4e8d4b27cce95b771ff544909cb9a8657b9cba0b 100644 --- a/modules/system/system.updater.inc +++ b/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. */ @@ -145,7 +145,7 @@ public function postInstall() { ->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 a/modules/toolbar/toolbar.css b/modules/toolbar/toolbar.css index 423c94b55fbb27bb7133ec11582651e4115d2fdd..e7c30336b6f8e10f127807b6c60891ea3ca17189 100644 --- a/modules/toolbar/toolbar.css +++ b/modules/toolbar/toolbar.css @@ -86,7 +86,7 @@ body.toolbar-drawer { #toolbar-user { float: right; } - + #toolbar-menu { float: left; } diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module index c8f28ed9e9ebfff98406320013c0164d27f58567..228ae8173f6374c86f07902d7f1a3cd4e9bb4daf 100644 --- a/modules/toolbar/toolbar.module +++ b/modules/toolbar/toolbar.module @@ -78,7 +78,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. @@ -102,7 +102,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. */ @@ -225,7 +225,7 @@ function toolbar_view() { '#links' => $links, '#attributes' => array('id' => 'toolbar-user'), ); - + // Add a "home" link. $link = array( 'home' => array( @@ -275,7 +275,7 @@ function toolbar_get_menu_tree() { $admin_link = array_pop($tree); $tree = $admin_link['below'] ? $admin_link['below'] : array(); } - + return $tree; } diff --git a/modules/translation/translation.module b/modules/translation/translation.module index 2074bb63a20b39d76b0fe1737010387f1851367a..b1348c948585d557fe235cd80fe7a4c1322d0eae 100644 --- a/modules/translation/translation.module +++ b/modules/translation/translation.module @@ -210,7 +210,7 @@ function translation_node_prepare($node) { isset($_GET['translation']) && isset($_GET['language']) && is_numeric($_GET['translation'])) { - + $source_node = node_load($_GET['translation']); if (empty($source_node) || !node_access('view', $source_node)) { // Source node not found or no access to view. We should not check @@ -218,13 +218,13 @@ function translation_node_prepare($node) { // to edit the source node but should still be able to translate. return; } - + $language_list = language_list(); if (!isset($language_list[$_GET['language']]) || ($source_node->language == $_GET['language'])) { // If not supported language, or same language as source node, break. return; } - + // Ensure we don't have an existing translation in this language. if (!empty($source_node->tnid)) { $translations = translation_node_get_translations($source_node->tnid); @@ -233,7 +233,7 @@ function translation_node_prepare($node) { return; } } - + // Populate fields based on source node. $node->language = $_GET['language']; $node->translation_source = $source_node; diff --git a/modules/translation/translation.pages.inc b/modules/translation/translation.pages.inc index 50d8849ee56e175f478b681c846ff5dfb23846d6..70fa7fd1076bafe5c165261078fe0a1fa2f481bf 100644 --- a/modules/translation/translation.pages.inc +++ b/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)), PASS_THROUGH); - + $build['translation_node_overview'] = array( - '#theme' => 'table', - '#header' => $header, + '#theme' => 'table', + '#header' => $header, '#rows' => $rows, ); - + return $build; } diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc index 9a7c732f1a0418ea80425ab02bf2c3e388bebf0c..1dd0ba58627272124535e8c5bdea1c4cca81f2fd 100644 --- a/modules/update/update.compare.inc +++ b/modules/update/update.compare.inc @@ -774,7 +774,7 @@ function update_filter_project_info($info) { 'package', 'project', 'project status url', - 'version', + 'version', ); return array_intersect_key($info, drupal_map_assoc($whitelist)); } diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc index cbd53906a704c12fa39a25046a2e6dea05d68c63..3425ae247b32e230471a338f7b2470b891525ca2 100644 --- a/modules/update/update.manager.inc +++ b/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; @@ -547,7 +547,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); @@ -583,12 +583,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, @@ -715,7 +715,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 a/modules/update/update.report.inc b/modules/update/update.report.inc index 22d70bea8d4c9fd27a9399882b5fd0dfbaabaf55..b33cea89746af4a547cd54c8e11f08499f3ac83b 100644 --- a/modules/update/update.report.inc +++ b/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[] = drupal_placeholder(array('text' => $base_theme)); } diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index bbce9b62ba5ceb1188f5f712ccf1a8a8f4b670d4..9eed7c5cc499ab92130c911a640b69d3d0d2a7a0 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -702,7 +702,7 @@ function user_admin_permissions($form, $form_state, $rid = NULL) { $form['checkboxes'][$rid] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => isset($status[$rid]) ? $status[$rid] : array()); $form['role_names'][$rid] = array('#markup' => $name, '#tree' => TRUE); } - + $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions'))); $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save permissions')); diff --git a/modules/user/user.css b/modules/user/user.css index 5a1bf5c679a9a30c58ff22a8b0aa8637a83103aa..51222f0c1e0ad11a2cc13409e6a16b60bd21b775 100644 --- a/modules/user/user.css +++ b/modules/user/user.css @@ -29,7 +29,7 @@ padding-bottom: .5em; } -/** +/** * Override default textfield float to put the "Add role" button next to * the input textfield. */ diff --git a/modules/user/user.module b/modules/user/user.module index dca04f216b65c49ee7e9b945a768719f5584fc57..ed9aa6bf0cad688c4d1cbf0998e8c6865a16283f 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -2350,7 +2350,7 @@ function _user_mail_text($key, $language = NULL, $variables = array(), $replace break; case 'status_blocked_body': $text = t("!user-name-token, - + Your account on !site-name-token has been blocked. -- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 15c41a725a1512ede98e72a96b098e8578ea610a..6c74139ec535dcbaa85a27c5799d38a9f3065236 100644 --- a/sites/default/default.settings.php +++ b/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 @@ -182,7 +182,7 @@ * * Example: * $drupal_hash_salt = file_get_contents('/home/example/salt.txt'); - * + * */ $drupal_hash_salt = ''; diff --git a/themes/garland/color/preview.css b/themes/garland/color/preview.css index 8ba58760919455f29f21fddbf98de7d23ef7528b..921f7125adcda6cc8d1af0d50310b2257e2576b1 100644 --- a/themes/garland/color/preview.css +++ b/themes/garland/color/preview.css @@ -55,4 +55,4 @@ } #preview a:hover { text-decoration: underline; -} \ No newline at end of file +} diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php index 1edfcb46abf309867a076deb5025397fc1daa09e..3f6ba9ca8bd1773be78eceb5f3f947df120bca9a 100644 --- a/themes/garland/maintenance-page.tpl.php +++ b/themes/garland/maintenance-page.tpl.php @@ -50,7 +50,7 @@ $site_html = implode(' ', $site_fields); if ($logo || $site_title) { - print '<h1 id="branding"><a href="' . $base_path . '" title="' . $site_title . '">'; + print '<h1 id="branding"><a href="' . $base_path . '" title="' . $site_title . '">'; if ($logo) { print '<img src="' . $logo . '" alt="' . $site_title . '" id="logo" />'; } diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php index 441a3bfe646a67eed39a432b34f25995396e0c44..54f67bfd231d9ccc7d940b16d61c10dd456ad696 100644 --- a/themes/garland/page.tpl.php +++ b/themes/garland/page.tpl.php @@ -15,8 +15,8 @@ <img src="<?php print $logo ?>" alt="<?php print $site_name_and_slogan ?>" id="logo" /> <?php endif; ?> <?php print $site_html ?> - </a></strong></div> - <?php else: /* Use h1 when the content title is empty */ ?> + </a></strong></div> + <?php else: /* Use h1 when the content title is empty */ ?> <h1 id="branding"><a href="<?php print $front_page ?>" title="<?php print $site_name_and_slogan ?>"> <?php if ($logo): ?> <img src="<?php print $logo ?>" alt="<?php print $site_name_and_slogan ?>" id="logo" /> diff --git a/themes/garland/style.css b/themes/garland/style.css index 51cfedb60f0e1198a64f8f2d1c2f55d51ea3e0af..4fc79748c2da435693451a21483a2d96f0cf8977 100644 --- a/themes/garland/style.css +++ b/themes/garland/style.css @@ -294,8 +294,8 @@ table .form-button, table .form-submit { * Skip link */ #skip-link a:link, #skip-link a:visited { - font-weight: bold; - background: #fff; + font-weight: bold; + background: #fff; padding: 0px 5px; text-decoration: none; font-size: 80%; diff --git a/themes/garland/template.php b/themes/garland/template.php index e29967c6e40f90e5b6d366c4a7523f33c3f6ce38..630404a7e11732f838bfc70aec192701510ab1bf 100644 --- a/themes/garland/template.php +++ b/themes/garland/template.php @@ -103,7 +103,7 @@ function garland_preprocess_page(&$vars) { $site_fields[0] = '<span>' . $site_fields[0] . '</span>'; } $vars['site_html'] = implode(' ', $site_fields); - + // Set a variable for the site name title and logo alt attributes text. $slogan_text = filter_xss_admin(variable_get('site_slogan', '')); $site_name_text = filter_xss_admin(variable_get('site_name', 'Drupal')); diff --git a/themes/seven/ie6.css b/themes/seven/ie6.css index 9c3dca8ca2ce8c3a068e899433b59da35b630fb0..d4df280848e078d1987cef8279cb6020cbd6179c 100644 --- a/themes/seven/ie6.css +++ b/themes/seven/ie6.css @@ -16,4 +16,4 @@ ul.links li a, #block-system-main ul.node-type-list li div.description a, #block-system-main ul.admin-list li div.description a { display: inline; -} \ No newline at end of file +} diff --git a/themes/seven/style.css b/themes/seven/style.css index df0e6fddc11d2b042edf9fc9b9db7e16f17b1859..6da7919d310f85eb00fde1799f1e6c15a7819b70 100644 --- a/themes/seven/style.css +++ b/themes/seven/style.css @@ -791,7 +791,7 @@ select.form-select:focus { } .resizable-textarea .grippie { - width: 100%; + width: 100%; padding: 0 2px; }