Commit b8a1eab1 authored by Dries's avatar Dries

- Patch #210131 by dvessel, catch, John, et al: updated jQuery library.

parent bddba847
......@@ -182,7 +182,7 @@ INSTALLATION
unexpected problems on an existing site. If you modify the file system path
on an existing site, remember to copy all files from the original location
to the new location.
Some administrators suggest making the documentation files, especially
CHANGELOG.txt, non-readable so that the exact version of Drupal you are
running is slightly more difficult to determine. If you wish to implement
......
......@@ -8,9 +8,9 @@
*
* All modules should declare their form builder functions to be in this
* group and each builder function should reference its validate and submit
* functions using \@see. Conversely, validate and submit functions should
* functions using \@see. Conversely, validate and submit functions should
* reference the form builder function using \@see. For examples, of this see
* system_modules_uninstall() or user_pass(), the latter of which has the
* system_modules_uninstall() or user_pass(), the latter of which has the
* following in its doxygen documentation:
*
* \@ingroup forms
......@@ -913,7 +913,7 @@ function form_builder($form_id, $form, &$form_state) {
// Now that we've processed everything, we can go back to handle the funky
// Internet Explorer button-click scenario.
_form_builder_ie_cleanup($form, $form_state);
// We shoud keep the buttons array until the IE clean up function
// has recognized the submit button so the form has been marked
// as submitted. If we already know which button was submitted,
......
......@@ -38,7 +38,7 @@ function image_gd_settings() {
'#field_suffix' => t('%'),
);
$form['#element_validate'] = array('image_gd_settings_validate');
return $form;
}
else {
......
......@@ -17,7 +17,7 @@ function language_initialize() {
// Get a list of enabled languages.
$languages = language_list('enabled');
$languages = $languages[1];
switch ($mode) {
case LANGUAGE_NEGOTIATION_NONE:
return language_default();
......
......@@ -433,7 +433,7 @@ function _drupal_wrap_mail_line(&$line, $key, $values) {
function _drupal_html_to_mail_urls($match = NULL, $reset = FALSE) {
global $base_url, $base_path;
static $urls = array(), $regexp;
if ($reset) {
// Reset internal URL list.
$urls = array();
......
......@@ -363,7 +363,7 @@ function menu_execute_active_handler($path = NULL) {
* @return
* Returns TRUE for success, FALSE if an object cannot be loaded.
* Names of object loading functions are placed in $item['load_functions'].
* Loaded objects are placed in $map[]; keys are the same as keys in the
* Loaded objects are placed in $map[]; keys are the same as keys in the
* $item['load_functions'] array.
* $item['access'] is set to FALSE if an object cannot be loaded.
*/
......@@ -472,10 +472,10 @@ function _menu_check_access(&$item, $map) {
* @return
* No return value.
* $item['title'] is localized according to $item['title_callback'].
* If an item's callback is check_plain(), $item['options']['html'] becomes
* If an item's callback is check_plain(), $item['options']['html'] becomes
* TRUE.
* $item['description'] is translated using t().
* When doing link translation and the $item['options']['attributes']['title']
* When doing link translation and the $item['options']['attributes']['title']
* (link title attribute) matches the description, it is translated as well.
*/
function _menu_item_localize(&$item, $map, $link_translate = FALSE) {
......@@ -619,7 +619,7 @@ function menu_tail_to_arg($arg, $map, $index) {
* $item['access'] becomes TRUE if the item is accessible, FALSE otherwise.
* $item['href'] is generated from link_path, possibly by to_arg functions.
* $item['title'] is generated from link_title, and may be localized.
* $item['options'] is unserialized; it is also changed within the call here
* $item['options'] is unserialized; it is also changed within the call here
* to $item['localized_options'] by _menu_item_localize().
*/
function _menu_link_translate(&$item) {
......@@ -1507,7 +1507,7 @@ function menu_get_active_trail() {
*/
function menu_get_active_breadcrumb() {
$breadcrumb = array();
// No breadcrumb for the front page.
if (drupal_is_front_page()) {
return $breadcrumb;
......
......@@ -1454,9 +1454,9 @@ function theme_more_help_link($url) {
/**
* Return code that emits an XML icon.
*
*
* For most use cases, this function has been superseded by theme_feed_icon().
*
*
* @see theme_feed_icon()
* @param $url
* The url of the feed.
......
......@@ -124,7 +124,7 @@ function theme_install_page($content) {
$variables['messages'] .= theme('status_messages', 'error');
$variables['content'] .= '<p>'. st('Please check the error messages and <a href="!url">try again</a>.', array('!url' => request_uri())) .'</p>';
}
// Special handling of warning messages
if (isset($messages['warning'])) {
$title = count($messages['warning']) > 1 ? st('The following installation warnings should be carefully reviewed') : st('The following installation warning should be carefully reviewed');
......
......@@ -916,7 +916,7 @@ function install_check_requirements($profile, $verify) {
drupal_set_message($message, 'warning');
}
}
}
}
}
/**
......
......@@ -271,7 +271,9 @@ if (Drupal.jsEnabled) {
// 'js enabled' cookie
document.cookie = 'has_js=1; path=/';
// Attach all behaviors.
$(document).ready(Drupal.attachBehaviors);
$(document).ready(function() {
Drupal.attachBehaviors(this);
});
}
/**
......
This diff is collapsed.
......@@ -4,7 +4,7 @@ Drupal.behaviors.textarea = function(context) {
$('textarea.resizable:not(.textarea-processed)', context).each(function() {
// Avoid non-processed teasers.
if ($(this).is(('textarea.teaser:not(.teaser-processed)'))) {
return false;
return false;
}
var textarea = $(this).addClass('textarea-processed'), staticOffset = null;
......
......@@ -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));
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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;
......
......@@ -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.'));
......
......@@ -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) {
......
......@@ -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']);
......
......@@ -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'])) {
......
......@@ -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;
}
......
......@@ -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()
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment