diff options
author | Dries Buytaert <dries@buytaert.net> | 2008-02-06 19:38:28 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2008-02-06 19:38:28 +0000 |
commit | b8a1eab1fb8abb1238f1e5a63757f0d93b2a3cc6 (patch) | |
tree | 0dff0188249d8c3d2999d9b4342e3c1e99711b9e /modules | |
parent | bddba847f569f872aefa1618d2fe49d69f274c63 (diff) | |
download | brdo-b8a1eab1fb8abb1238f1e5a63757f0d93b2a3cc6.tar.gz brdo-b8a1eab1fb8abb1238f1e5a63757f0d93b2a3cc6.tar.bz2 |
- Patch #210131 by dvessel, catch, John, et al: updated jQuery library.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/blog/blog.module | 2 | ||||
-rw-r--r-- | modules/comment/comment.module | 4 | ||||
-rw-r--r-- | modules/forum/forum.module | 2 | ||||
-rw-r--r-- | modules/locale/locale.install | 2 | ||||
-rw-r--r-- | modules/locale/locale.module | 4 | ||||
-rw-r--r-- | modules/menu/menu.install | 2 | ||||
-rw-r--r-- | modules/node/node.admin.inc | 4 | ||||
-rw-r--r-- | modules/openid/openid.inc | 2 | ||||
-rw-r--r-- | modules/openid/openid.module | 6 | ||||
-rw-r--r-- | modules/taxonomy/taxonomy.pages.inc | 2 | ||||
-rw-r--r-- | modules/update/update.install | 2 | ||||
-rw-r--r-- | modules/user/user.module | 6 |
12 files changed, 19 insertions, 19 deletions
diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 4efb8c291..2a757cfec 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -32,7 +32,7 @@ function blog_perm() { function blog_access($op, $node, $account) { switch ($op) { case 'create': - // Anonymous users cannot post even if they have the permission. + // Anonymous users cannot post even if they have the permission. return user_access('create blog entries', $account) && $account->uid; case 'update': return user_access('edit any blog entry', $account) || (user_access('edit own blog entries', $account) && ($node->uid == $account->uid)); diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 017623280..faf77f741 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1771,14 +1771,14 @@ function theme_comment_thread_expanded($comment, $node) { function theme_comment_post_forbidden($node) { global $user; static $authenticated_post_comments; - + if (!$user->uid) { if (!isset($authenticated_post_comments)) { // We only output any link if we are certain, that users get permission // to post comments by logging in. We also locally cache this information. $authenticated_post_comments = array_key_exists(DRUPAL_AUTHENTICATED_RID, user_roles(TRUE, 'post comments') + user_roles(TRUE, 'post comments without approval')); } - + if ($authenticated_post_comments) { // We cannot use drupal_get_destination() because these links // sometimes appear on /node and taxonomy listing pages. diff --git a/modules/forum/forum.module b/modules/forum/forum.module index ad6844e2d..491f49eab 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -372,7 +372,7 @@ function forum_form_alter(&$form, $form_state, $form_id) { // Hide multiple parents select from forum terms. elseif ($form_id == 'taxonomy_form_term') { $form['advanced']['parent']['#access'] = FALSE; - } + } } if ($form_id == 'forum_node_form') { // Make the vocabulary required for 'real' forum-nodes. diff --git a/modules/locale/locale.install b/modules/locale/locale.install index 29718de06..cd4f8e92d 100644 --- a/modules/locale/locale.install +++ b/modules/locale/locale.install @@ -164,7 +164,7 @@ function locale_update_6004() { /** * Change language setting variable of content types. - * + * * Use language_content_type_<content_type> instead of language_<content_type> * so content types such as 'default', 'count' or 'negotiation' will not * interfere with language variables. diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 0404467ab..3aafbda17 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -225,7 +225,7 @@ function locale_user($type, $edit, &$user, $category = NULL) { '#weight' => 1, ); - // Get language negotiation settings. + // Get language negotiation settings. $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE); $form['locale']['language'] = array( '#type' => (count($names) <= 5 ? 'radios' : 'select'), @@ -328,7 +328,7 @@ function locale($string = NULL, $langcode = NULL, $reset = FALSE) { // Reset in-memory cache. $locale_t = NULL; } - + if (!isset($string)) { // Return all cached strings if no string was specified return $locale_t; diff --git a/modules/menu/menu.install b/modules/menu/menu.install index 1e32ab6e2..b9ec7fd0f 100644 --- a/modules/menu/menu.install +++ b/modules/menu/menu.install @@ -7,7 +7,7 @@ function menu_install() { // Create tables. drupal_install_schema('menu'); - + $t = get_t(); db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'navigation', $t('Navigation'), $t('The navigation menu is provided by Drupal and is the main interactive menu for any site. It is usually the only menu that contains personalized links for authenticated users, and is often not even visible to anonymous users.')); db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'primary-links', $t('Primary links'), $t('Primary links are often used at the theme layer to show the major sections of a site. A typical representation for primary links would be tabs along the top.')); diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index 21e4c4e4f..b0be96c83 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -511,7 +511,7 @@ function node_admin_nodes() { /** * Validate node_admin_nodes form submissions. - * + * * Check if any nodes have been selected to perform the chosen * 'Update option' on. */ @@ -524,7 +524,7 @@ function node_admin_nodes_validate($form, &$form_state) { /** * Process node_admin_nodes form submissions. - * + * * Execute the chosen 'Update option' on the selected nodes. */ function node_admin_nodes_submit($form, &$form_state) { diff --git a/modules/openid/openid.inc b/modules/openid/openid.inc index e20cf9806..db979b67e 100644 --- a/modules/openid/openid.inc +++ b/modules/openid/openid.inc @@ -386,7 +386,7 @@ function _openid_get_bytes($num_bytes) { function _openid_response($str = NULL) { $data = array(); - + if (isset($_SERVER['REQUEST_METHOD'])) { $data = _openid_get_params($_SERVER['QUERY_STRING']); diff --git a/modules/openid/openid.module b/modules/openid/openid.module index d77ee73b2..69c981922 100644 --- a/modules/openid/openid.module +++ b/modules/openid/openid.module @@ -94,7 +94,7 @@ function openid_form_alter(&$form, $form_state, $form_id) { 'data' => l(t('Cancel OpenID login'), '#'), 'class' => 'user-link', ); - + $form['openid_links'] = array( '#value' => theme('item_list', $items), '#weight' => 1, @@ -192,7 +192,7 @@ function openid_begin($claimed_id, $return_to = '', $form_values = array()) { if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0 .'/server', $services[0]['types'])) { $identity = 'http://specs.openid.net/auth/2.0/identifier_select'; - } + } $authn_request = openid_authentication_request($claimed_id, $identity, $return_to, $assoc_handle, $services[0]['version']); if ($services[0]['version'] == 2) { @@ -218,7 +218,7 @@ function openid_complete($response = array()) { if (count($response) == 0) { $response = _openid_response(); } - + // Default to failed response $response['status'] = 'failed'; if (isset($_SESSION['openid']['service']['uri']) && isset($_SESSION['openid']['claimed_id'])) { diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index fdc2b09d3..b3e088c6a 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -57,7 +57,7 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') { } $result = taxonomy_select_nodes($tids, $terms['operator'], $depth, FALSE); - $items = array(); + $items = array(); while ($row = db_fetch_object($result)) { $items[] = $row->nid; } diff --git a/modules/update/update.install b/modules/update/update.install index 520d73a31..001dd7c7a 100644 --- a/modules/update/update.install +++ b/modules/update/update.install @@ -41,7 +41,7 @@ function update_schema() { } /** - * Private helper to clear out stale variables from update_status 5.x contrib. + * Private helper to clear out stale variables from update_status 5.x contrib. * * @see update_install() * @see update_update_6000() diff --git a/modules/user/user.module b/modules/user/user.module index dfb4fc24d..f03fbc5ac 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1260,9 +1260,9 @@ function user_login(&$form_state, $msg = '') { /** * Set up a series for validators which check for blocked/denied users, * then authenticate against local database, then return an error if - * authentication fails. Distributed authentication modules are welcome - * to use hook_form_alter() to change this series in order to - * authenticate against their user database instead of the local users + * authentication fails. Distributed authentication modules are welcome + * to use hook_form_alter() to change this series in order to + * authenticate against their user database instead of the local users * table. * * We use three validators instead of one since external authentication |