[Pkg-drupal-commits] r2065 - in /branches/upstream/current-6: ./ includes/ misc/ modules/aggregator/ modules/block/ modules/blog/ modules/blogapi/ modules/book/ modules/color/ modules/comment/ modules/contact/ modules/dblog/ modules/filter/ modules/forum/ modules/help/ modules/locale/ modules/menu/ modules/node/ modules/openid/ modules/path/ modules/php/ modules/ping/ modules/poll/ modules/profile/ modules/search/ modules/statistics/ modules/syslog/ modules/system/ modules/taxonomy/ modules/throttle/ modules/tracker/ modules/translation/ modules/trigger/ modules/update/ modules/upload/ modules/user/ sites/default/ themes/bluemarine/ themes/chameleon/ themes/chameleon/marvin/ themes/garland/ themes/garland/minnelli/ themes/pushbutton/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Mon Jul 13 16:40:45 UTC 2009
Author: luigi
Date: Mon Jul 13 16:40:43 2009
New Revision: 2065
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2065
Log:
[svn-upgrade] Integrating new upstream version, drupal6 (6.13)
Modified:
branches/upstream/current-6/CHANGELOG.txt
branches/upstream/current-6/includes/cache.inc
branches/upstream/current-6/includes/common.inc
branches/upstream/current-6/includes/database.inc
branches/upstream/current-6/includes/database.pgsql.inc
branches/upstream/current-6/includes/file.inc
branches/upstream/current-6/includes/form.inc
branches/upstream/current-6/includes/locale.inc
branches/upstream/current-6/includes/mail.inc
branches/upstream/current-6/includes/pager.inc
branches/upstream/current-6/includes/tablesort.inc
branches/upstream/current-6/includes/theme.inc
branches/upstream/current-6/misc/tabledrag.js
branches/upstream/current-6/misc/teaser.js
branches/upstream/current-6/modules/aggregator/aggregator.info
branches/upstream/current-6/modules/block/block.info
branches/upstream/current-6/modules/blog/blog.info
branches/upstream/current-6/modules/blogapi/blogapi.info
branches/upstream/current-6/modules/book/book.info
branches/upstream/current-6/modules/color/color.info
branches/upstream/current-6/modules/color/color.module
branches/upstream/current-6/modules/comment/comment.info
branches/upstream/current-6/modules/comment/comment.module
branches/upstream/current-6/modules/comment/comment.pages.inc
branches/upstream/current-6/modules/contact/contact.info
branches/upstream/current-6/modules/dblog/dblog.info
branches/upstream/current-6/modules/filter/filter.info
branches/upstream/current-6/modules/forum/forum.admin.inc
branches/upstream/current-6/modules/forum/forum.info
branches/upstream/current-6/modules/forum/forum.module
branches/upstream/current-6/modules/forum/forum.pages.inc
branches/upstream/current-6/modules/help/help.info
branches/upstream/current-6/modules/locale/locale.info
branches/upstream/current-6/modules/menu/menu.info
branches/upstream/current-6/modules/node/node.admin.inc
branches/upstream/current-6/modules/node/node.info
branches/upstream/current-6/modules/openid/openid.info
branches/upstream/current-6/modules/openid/openid.module
branches/upstream/current-6/modules/path/path.info
branches/upstream/current-6/modules/php/php.info
branches/upstream/current-6/modules/ping/ping.info
branches/upstream/current-6/modules/poll/poll.info
branches/upstream/current-6/modules/profile/profile.info
branches/upstream/current-6/modules/search/search.info
branches/upstream/current-6/modules/statistics/statistics.info
branches/upstream/current-6/modules/syslog/syslog.info
branches/upstream/current-6/modules/system/system.admin.inc
branches/upstream/current-6/modules/system/system.info
branches/upstream/current-6/modules/system/system.install
branches/upstream/current-6/modules/system/system.module
branches/upstream/current-6/modules/taxonomy/taxonomy.info
branches/upstream/current-6/modules/throttle/throttle.info
branches/upstream/current-6/modules/tracker/tracker.info
branches/upstream/current-6/modules/translation/translation.info
branches/upstream/current-6/modules/trigger/trigger.info
branches/upstream/current-6/modules/trigger/trigger.module
branches/upstream/current-6/modules/update/update.compare.inc
branches/upstream/current-6/modules/update/update.fetch.inc
branches/upstream/current-6/modules/update/update.info
branches/upstream/current-6/modules/update/update.module
branches/upstream/current-6/modules/update/update.report.inc
branches/upstream/current-6/modules/upload/upload.info
branches/upstream/current-6/modules/user/user.info
branches/upstream/current-6/modules/user/user.install
branches/upstream/current-6/modules/user/user.module
branches/upstream/current-6/sites/default/default.settings.php
branches/upstream/current-6/themes/bluemarine/bluemarine.info
branches/upstream/current-6/themes/chameleon/chameleon.info
branches/upstream/current-6/themes/chameleon/marvin/marvin.info
branches/upstream/current-6/themes/garland/garland.info
branches/upstream/current-6/themes/garland/minnelli/minnelli.info
branches/upstream/current-6/themes/pushbutton/pushbutton.info
Modified: branches/upstream/current-6/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/CHANGELOG.txt?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/CHANGELOG.txt (original)
+++ branches/upstream/current-6/CHANGELOG.txt Mon Jul 13 16:40:43 2009
@@ -1,4 +1,10 @@
-// $Id: CHANGELOG.txt,v 1.253.2.29 2009/05/13 19:11:04 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.31 2009/07/01 20:51:55 goba Exp $
+
+Drupal 6.13, 2009-07-01
+----------------------
+- Fixed security issues (Cross site scripting, Input format access bypass and
+ Password leakage in URL), see SA-CORE-2009-007.
+- Fixed a variety of small bugs.
Drupal 6.12, 2009-05-13
----------------------
@@ -186,6 +192,11 @@
- Removed old system updates. Updates from Drupal versions prior to 5.x will
require upgrading to 5.x before upgrading to 6.x.
+Drupal 5.19, 2009-07-01
+-----------------------
+- Fixed security issues (Cross site scripting and Password leakage in URL), see SA-CORE-2009-007.
+- Fixed a variety of small bugs.
+
Drupal 5.18, 2009-05-13
----------------------
- Fixed security issues (Cross site scripting), see SA-CORE-2009-006.
Modified: branches/upstream/current-6/includes/cache.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/cache.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/cache.inc (original)
+++ branches/upstream/current-6/includes/cache.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: cache.inc,v 1.17.2.1 2009/04/27 14:23:58 goba Exp $
+// $Id: cache.inc,v 1.17.2.2 2009/05/26 08:10:33 goba Exp $
/**
* Return data from the persistent cache. Data may be stored as either plain text or as serialized data.
@@ -155,7 +155,7 @@
variable_set('cache_flush_'. $table, time());
}
else if (time() > ($cache_flush + variable_get('cache_lifetime', 0))) {
- // Clear the cache for everyone, cache_flush_delay seconds have
+ // Clear the cache for everyone, cache_lifetime seconds have
// passed since the first request to clear the cache.
db_query("DELETE FROM {". $table ."} WHERE expire != %d AND expire < %d", CACHE_PERMANENT, time());
variable_set('cache_flush_'. $table, 0);
Modified: branches/upstream/current-6/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/common.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/common.inc (original)
+++ branches/upstream/current-6/includes/common.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.756.2.52 2009/05/13 19:11:04 goba Exp $
+// $Id: common.inc,v 1.756.2.57 2009/07/01 20:51:55 goba Exp $
/**
* @file
@@ -481,6 +481,16 @@
// If the server url has a user then attempt to use basic authentication
if (isset($uri['user'])) {
$defaults['Authorization'] = 'Authorization: Basic '. base64_encode($uri['user'] . (!empty($uri['pass']) ? ":". $uri['pass'] : ''));
+ }
+
+ // If the database prefix is being used by SimpleTest to run the tests in a copied
+ // database then set the user-agent header to the database prefix so that any
+ // calls to other Drupal pages will run the SimpleTest prefixed database. The
+ // user-agent is used to ensure that multiple testing sessions running at the
+ // same time won't interfere with each other as they would if the database
+ // prefix were stored statically in a file or database variable.
+ if (preg_match("/simpletest\d+/", $GLOBALS['db_prefix'], $matches)) {
+ $defaults['User-Agent'] = 'User-Agent: ' . $matches[0];
}
foreach ($headers as $header => $value) {
@@ -1846,7 +1856,9 @@
}
if ($is_writable && $preprocess_css) {
- $filename = md5(serialize($types) . $query_string) .'.css';
+ // Prefix filename to prevent blocking by firewalls which reject files
+ // starting with "ad*".
+ $filename = 'css_'. md5(serialize($types) . $query_string) .'.css';
$preprocess_file = drupal_build_css_cache($types, $filename);
$output .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $preprocess_file .'" />'."\n";
}
@@ -2194,7 +2206,9 @@
// Aggregate any remaining JS files that haven't already been output.
if ($is_writable && $preprocess_js && count($files) > 0) {
- $filename = md5(serialize($files) . $query_string) .'.js';
+ // Prefix filename to prevent blocking by firewalls which reject files
+ // starting with "ad*".
+ $filename = 'js_'. md5(serialize($files) . $query_string) .'.js';
$preprocess_file = drupal_build_js_cache($files, $filename);
$preprocessed .= '<script type="text/javascript" src="'. base_path() . $preprocess_file .'"></script>'."\n";
}
@@ -3669,7 +3683,8 @@
function _drupal_flush_css_js() {
$string_history = variable_get('css_js_query_string', '00000000000000000000');
$new_character = $string_history[0];
- $characters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+ // Not including 'q' to allow certain JavaScripts to re-use query string.
+ $characters = 'abcdefghijklmnoprstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
while (strpos($string_history, $new_character) !== FALSE) {
$new_character = $characters[mt_rand(0, strlen($characters) - 1)];
}
Modified: branches/upstream/current-6/includes/database.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/database.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.inc (original)
+++ branches/upstream/current-6/includes/database.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: database.inc,v 1.92.2.4 2009/02/16 14:41:58 goba Exp $
+// $Id: database.inc,v 1.92.2.5 2009/06/09 10:42:02 goba Exp $
/**
* @file
@@ -427,6 +427,8 @@
* just map to the according database engine specific
* datatypes. Use 'serial' for auto incrementing fields. This
* will expand to 'int auto_increment' on mysql.
+ * - 'serialize': A boolean indicating whether the field will be stored
+ as a serialized string.
* - 'size': The data size: 'tiny', 'small', 'medium', 'normal',
* 'big'. This is a hint about the largest value the field will
* store and determines which of the database engine specific
Modified: branches/upstream/current-6/includes/database.pgsql.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/database.pgsql.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.pgsql.inc (original)
+++ branches/upstream/current-6/includes/database.pgsql.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: database.pgsql.inc,v 1.68.2.4 2009/03/30 13:04:06 goba Exp $
+// $Id: database.pgsql.inc,v 1.68.2.5 2009/06/09 10:53:52 goba Exp $
/**
* @file
@@ -910,9 +910,20 @@
$not_null = isset($spec['not null']) ? $spec['not null'] : FALSE;
unset($spec['not null']);
+ if (!array_key_exists('size', $spec)) {
+ $spec['size'] = 'normal';
+ }
db_add_field($ret, $table, "$field_new", $spec);
- $ret[] = update_sql("UPDATE {". $table ."} SET $field_new = ". $field ."_old");
+ // We need to type cast the new column to best transfer the data
+ // db_type_map will return possiblities that are not 'cast-able'
+ // such as serial - they must be made 'int' instead.
+ $map = db_type_map();
+ $typecast = $map[$spec['type'] .':'. $spec['size']];
+ if (in_array($typecast, array('serial', 'bigserial', 'numeric'))) {
+ $typecast = 'int';
+ }
+ $ret[] = update_sql('UPDATE {'. $table .'} SET '. $field_new .' = CAST('. $field .'_old AS '. $typecast .')');
if ($not_null) {
$ret[] = update_sql("ALTER TABLE {". $table ."} ALTER $field_new SET NOT NULL");
Modified: branches/upstream/current-6/includes/file.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/file.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/file.inc (original)
+++ branches/upstream/current-6/includes/file.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: file.inc,v 1.121.2.6 2009/04/13 19:07:16 dries Exp $
+// $Id: file.inc,v 1.121.2.7 2009/06/09 10:37:38 goba Exp $
/**
* @file
@@ -640,7 +640,7 @@
* @param $file_limit
* An integer specifying the maximum file size in bytes. Zero indicates that
* no limit should be enforced.
- * @param $$user_limit
+ * @param $user_limit
* An integer specifying the maximum number of bytes the user is allowed. Zero
* indicates that no limit should be enforced.
* @return
@@ -657,8 +657,8 @@
$errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($file->filesize), '%maxsize' => format_size($file_limit)));
}
- $total_size = file_space_used($user->uid) + $file->filesize;
- if ($user_limit && $total_size > $user_limit) {
+ // Save a query by only calling file_space_used() when a limit is provided.
+ if ($user_limit && (file_space_used($user->uid) + $file->filesize) > $user_limit) {
$errors[] = t('The file is %filesize which would exceed your disk quota of %quota.', array('%filesize' => format_size($file->filesize), '%quota' => format_size($user_limit)));
}
}
Modified: branches/upstream/current-6/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/form.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/form.inc (original)
+++ branches/upstream/current-6/includes/form.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.265.2.24 2009/05/13 18:22:29 goba Exp $
+// $Id: form.inc,v 1.265.2.25 2009/05/26 08:18:46 goba Exp $
/**
* @defgroup forms Form builder functions
@@ -1624,7 +1624,7 @@
$pass1 = trim($form['pass1']['#value']);
if (!empty($pass1)) {
$pass2 = trim($form['pass2']['#value']);
- if ($pass1 != $pass2) {
+ if (strcmp($pass1, $pass2)) {
form_error($form, t('The specified passwords do not match.'));
}
}
Modified: branches/upstream/current-6/includes/locale.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/locale.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/locale.inc (original)
+++ branches/upstream/current-6/includes/locale.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: locale.inc,v 1.174.2.8 2009/04/08 02:54:00 dries Exp $
+// $Id: locale.inc,v 1.174.2.9 2009/06/18 12:50:33 goba Exp $
/**
* @file
@@ -847,8 +847,10 @@
* Validate string editing form submissions.
*/
function locale_translate_edit_form_validate($form, &$form_state) {
+ // Locale string check is needed for default textgroup only.
+ $safe_check_needed = $form_state['values']['textgroup'] == 'default';
foreach ($form_state['values']['translations'] as $key => $value) {
- if (!locale_string_is_safe($value)) {
+ if ($safe_check_needed && !locale_string_is_safe($value)) {
form_set_error('translations', t('The submitted string contains disallowed HTML: %string', array('%string' => $value)));
watchdog('locale', 'Attempted submission of a translation string with disallowed HTML: %string', array('%string' => $value), WATCHDOG_WARNING);
}
@@ -1340,7 +1342,9 @@
if (!empty($translation)) {
// Skip this string unless it passes a check for dangerous code.
- if (!locale_string_is_safe($translation)) {
+ // Text groups other than default still can contain HTML tags
+ // (i.e. translatable blocks).
+ if ($textgroup == "default" && !locale_string_is_safe($translation)) {
$report['skips']++;
$lid = 0;
}
Modified: branches/upstream/current-6/includes/mail.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/mail.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/mail.inc (original)
+++ branches/upstream/current-6/includes/mail.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: mail.inc,v 1.8.2.6 2009/04/27 11:07:43 goba Exp $
+// $Id: mail.inc,v 1.8.2.7 2009/06/18 12:15:44 goba Exp $
/**
* Compose and optionally send an e-mail message.
@@ -45,7 +45,7 @@
* switch($key) {
* case 'notice':
* $message['subject'] = t('Notification from !site', $variables, $language->language);
- * $message['body'] = t("Dear !username\n\nThere is new content available on the site.", $variables, $language->language);
+ * $message['body'][] = t("Dear !username\n\nThere is new content available on the site.", $variables, $language->language);
* break;
* }
* }
Modified: branches/upstream/current-6/includes/pager.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/pager.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/pager.inc (original)
+++ branches/upstream/current-6/includes/pager.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: pager.inc,v 1.63 2007/12/06 09:58:30 goba Exp $
+// $Id: pager.inc,v 1.63.2.1 2009/07/01 20:51:55 goba Exp $
/**
* @file
@@ -85,7 +85,7 @@
function pager_get_querystring() {
static $string = NULL;
if (!isset($string)) {
- $string = drupal_query_string_encode($_REQUEST, array_merge(array('q', 'page'), array_keys($_COOKIE)));
+ $string = drupal_query_string_encode($_REQUEST, array_merge(array('q', 'page', 'pass'), array_keys($_COOKIE)));
}
return $string;
}
Modified: branches/upstream/current-6/includes/tablesort.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/tablesort.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/tablesort.inc (original)
+++ branches/upstream/current-6/includes/tablesort.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: tablesort.inc,v 1.47 2008/01/04 09:31:48 goba Exp $
+// $Id: tablesort.inc,v 1.47.2.1 2009/07/01 20:51:55 goba Exp $
/**
* @file
@@ -136,7 +136,7 @@
* except for those pertaining to table sorting.
*/
function tablesort_get_querystring() {
- return drupal_query_string_encode($_REQUEST, array_merge(array('q', 'sort', 'order'), array_keys($_COOKIE)));
+ return drupal_query_string_encode($_REQUEST, array_merge(array('q', 'sort', 'order', 'pass'), array_keys($_COOKIE)));
}
/**
Modified: branches/upstream/current-6/includes/theme.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/theme.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/includes/theme.inc (original)
+++ branches/upstream/current-6/includes/theme.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: theme.inc,v 1.415.2.22 2009/05/13 19:11:04 goba Exp $
+// $Id: theme.inc,v 1.415.2.24 2009/06/18 12:04:04 goba Exp $
/**
* @file
@@ -1632,7 +1632,7 @@
$output .= ' ('. t('not verified') .')';
}
else {
- $output = variable_get('anonymous', t('Anonymous'));
+ $output = check_plain(variable_get('anonymous', t('Anonymous')));
}
return $output;
@@ -1820,8 +1820,8 @@
$variables['primary_links'] = theme_get_setting('toggle_primary_links') ? menu_primary_links() : array();
$variables['secondary_links'] = theme_get_setting('toggle_secondary_links') ? menu_secondary_links() : array();
$variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : '');
- $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
- $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : '');
+ $variables['site_name'] = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : '');
+ $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : '');
$variables['css'] = drupal_add_css();
$variables['styles'] = drupal_get_css();
$variables['scripts'] = drupal_get_js();
Modified: branches/upstream/current-6/misc/tabledrag.js
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/misc/tabledrag.js?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/misc/tabledrag.js (original)
+++ branches/upstream/current-6/misc/tabledrag.js Mon Jul 13 16:40:43 2009
@@ -1,4 +1,4 @@
-// $Id: tabledrag.js,v 1.13.2.4 2008/09/17 07:59:39 goba Exp $
+// $Id: tabledrag.js,v 1.13.2.5 2009/06/18 12:24:24 goba Exp $
/**
* Drag and drop table rows with field manipulation.
@@ -76,13 +76,15 @@
// manually append 2 indentations in the first draggable row, measure
// the offset, then remove.
var indent = Drupal.theme('tableDragIndentation');
- var testCell = $('tr.draggable:first td:first', table).prepend(indent).prepend(indent);
+ // Match immediate children of the parent element to allow nesting.
+ var testCell = $('> tbody > tr.draggable:first td:first, > tr.draggable:first td:first', table).prepend(indent).prepend(indent);
this.indentAmount = $('.indentation', testCell).get(1).offsetLeft - $('.indentation', testCell).get(0).offsetLeft;
$('.indentation', testCell).slice(0, 2).remove();
}
// Make each applicable row draggable.
- $('tr.draggable', table).each(function() { self.makeDraggable(this); });
+ // Match immediate children of the parent element to allow nesting.
+ $('> tr.draggable, > tbody > tr.draggable', table).each(function() { self.makeDraggable(this); });
// Hide columns containing affected form elements.
this.hideColumns();
@@ -112,9 +114,10 @@
// Hide the column containing this field.
if (hidden && cell[0] && cell.css('display') != 'none') {
// Add 1 to our indexes. The nth-child selector is 1 based, not 0 based.
- var columnIndex = $('td', cell.parent()).index(cell.get(0)) + 1;
- var headerIndex = $('td:not(:hidden)', cell.parent()).index(cell.get(0)) + 1;
- $('tr', this.table).each(function(){
+ // Match immediate children of the parent element to allow nesting.
+ var columnIndex = $('> td', cell.parent()).index(cell.get(0)) + 1;
+ var headerIndex = $('> td:not(:hidden)', cell.parent()).index(cell.get(0)) + 1;
+ $('> thead > tr, > tbody > tr, > tr', this.table).each(function(){
var row = $(this);
var parentTag = row.parent().get(0).tagName.toLowerCase();
var index = (parentTag == 'thead') ? headerIndex : columnIndex;
@@ -775,7 +778,8 @@
Drupal.tableDrag.prototype.restripeTable = function() {
// :even and :odd are reversed because jquery counts from 0 and
// we count from 1, so we're out of sync.
- $('tr.draggable', this.table)
+ // Match immediate children of the parent element to allow nesting.
+ $('> tbody > tr.draggable, > tr.draggable', this.table)
.filter(':odd').filter('.odd')
.removeClass('odd').addClass('even')
.end().end()
Modified: branches/upstream/current-6/misc/teaser.js
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/misc/teaser.js?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/misc/teaser.js (original)
+++ branches/upstream/current-6/misc/teaser.js Mon Jul 13 16:40:43 2009
@@ -1,4 +1,4 @@
-// $Id: teaser.js,v 1.12 2008/01/09 12:10:04 goba Exp $
+// $Id: teaser.js,v 1.12.2.1 2009/05/20 11:50:54 goba Exp $
/**
* Auto-attach for teaser behavior.
@@ -71,10 +71,10 @@
$(include).parent().parent().before(button);
// Extract the teaser from the body, if set. Otherwise, stay in joined mode.
- var text = body.val().split('<!--break-->', 2);
- if (text.length == 2) {
- teaser[0].value = trim(text[0]);
- body[0].value = trim(text[1]);
+ var text = body.val().split('<!--break-->');
+ if (text.length >= 2) {
+ teaser[0].value = trim(text.shift());
+ body[0].value = trim(text.join('<!--break-->'));
$(teaser).attr('disabled', '');
$('input', button).val(Drupal.t('Join summary')).toggle(join_teaser, split_teaser);
}
Modified: branches/upstream/current-6/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/aggregator/aggregator.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-6/modules/aggregator/aggregator.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/block/block.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/block/block.info (original)
+++ branches/upstream/current-6/modules/block/block.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blog/blog.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blog/blog.info (original)
+++ branches/upstream/current-6/modules/blog/blog.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blogapi/blogapi.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-6/modules/blogapi/blogapi.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/book/book.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/book/book.info (original)
+++ branches/upstream/current-6/modules/book/book.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/color/color.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/color/color.info (original)
+++ branches/upstream/current-6/modules/color/color.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/color/color.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/color/color.module?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/color/color.module (original)
+++ branches/upstream/current-6/modules/color/color.module Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: color.module,v 1.39.2.1 2009/02/25 11:47:37 goba Exp $
+// $Id: color.module,v 1.39.2.2 2009/05/16 16:09:21 dries Exp $
/**
* Implementation of hook_help().
@@ -203,7 +203,7 @@
/**
* Theme color form.
*
- * @ingroup @themeable
+ * @ingroup themeable
*/
function theme_color_scheme_form($form) {
// Include stylesheet
Modified: branches/upstream/current-6/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/comment/comment.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.info (original)
+++ branches/upstream/current-6/modules/comment/comment.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/comment/comment.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/comment/comment.module?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.module (original)
+++ branches/upstream/current-6/modules/comment/comment.module Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: comment.module,v 1.617.2.7 2009/05/13 17:15:10 goba Exp $
+// $Id: comment.module,v 1.617.2.8 2009/07/01 20:51:55 goba Exp $
/**
* @file
@@ -936,7 +936,7 @@
if ($cid && is_numeric($cid)) {
// Single comment view.
- $query = 'SELECT c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.signature, u.picture, u.data, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d';
+ $query = 'SELECT c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.signature, u.signature_format, u.picture, u.data, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d';
$query_args = array($cid);
if (!user_access('administer comments')) {
$query .= ' AND c.status = %d';
@@ -957,7 +957,7 @@
else {
// Multiple comment view
$query_count = 'SELECT COUNT(*) FROM {comments} c WHERE c.nid = %d';
- $query = 'SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.signature, u.picture, u.data, c.thread, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d';
+ $query = 'SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.signature, u.signature_format, u.picture, u.data, c.thread, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d';
$query_args = array($nid);
if (!user_access('administer comments')) {
@@ -1468,7 +1468,7 @@
$output = '';
if ($edit['pid']) {
- $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d', $edit['pid'], COMMENT_PUBLISHED));
+ $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.signature_format, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d', $edit['pid'], COMMENT_PUBLISHED));
$comment = drupal_unpack($comment);
$comment->name = $comment->uid ? $comment->registered_name : $comment->name;
$output .= theme('comment_view', $comment, $node);
@@ -1778,14 +1778,14 @@
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.
Modified: branches/upstream/current-6/modules/comment/comment.pages.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/comment/comment.pages.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.pages.inc (original)
+++ branches/upstream/current-6/modules/comment/comment.pages.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: comment.pages.inc,v 1.2.2.1 2008/02/07 18:53:38 goba Exp $
+// $Id: comment.pages.inc,v 1.2.2.2 2009/07/01 20:51:55 goba Exp $
/**
* @file
@@ -70,7 +70,7 @@
// $pid indicates that this is a reply to a comment.
if ($pid) {
// load the comment whose cid = $pid
- if ($comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d', $pid, COMMENT_PUBLISHED))) {
+ if ($comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.signature_format, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d', $pid, COMMENT_PUBLISHED))) {
// If that comment exists, make sure that the current comment and the parent comment both
// belong to the same parent node.
if ($comment->nid != $node->nid) {
Modified: branches/upstream/current-6/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/contact/contact.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/contact/contact.info (original)
+++ branches/upstream/current-6/modules/contact/contact.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/dblog/dblog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/dblog/dblog.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/dblog/dblog.info (original)
+++ branches/upstream/current-6/modules/dblog/dblog.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/filter/filter.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/filter/filter.info (original)
+++ branches/upstream/current-6/modules/filter/filter.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/forum/forum.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/forum/forum.admin.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.admin.inc (original)
+++ branches/upstream/current-6/modules/forum/forum.admin.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: forum.admin.inc,v 1.8 2008/01/30 10:14:42 goba Exp $
+// $Id: forum.admin.inc,v 1.8.2.1 2009/05/26 08:13:00 goba Exp $
/**
* @file
@@ -220,7 +220,6 @@
$vid = variable_get('forum_nav_vocabulary', '');
$vocabulary = taxonomy_vocabulary_load($vid);
$form = taxonomy_overview_terms($form_state, $vocabulary);
- drupal_set_title('Forums');
foreach (element_children($form) as $key) {
if (isset($form[$key]['#term'])) {
Modified: branches/upstream/current-6/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/forum/forum.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.info (original)
+++ branches/upstream/current-6/modules/forum/forum.info Mon Jul 13 16:40:43 2009
@@ -7,8 +7,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/forum/forum.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/forum/forum.module?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.module (original)
+++ branches/upstream/current-6/modules/forum/forum.module Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: forum.module,v 1.448.2.6 2009/03/30 11:09:51 goba Exp $
+// $Id: forum.module,v 1.448.2.7 2009/06/03 18:27:48 goba Exp $
/**
* @file
@@ -679,11 +679,11 @@
if (empty($forum_types)) {
// The user is logged-in; but denied access to create any new forum content type.
if ($user->uid) {
- $forum_types['disallowed'] = array('title' => t('You are not allowed to post new content in forum.'));
+ $forum_types['disallowed'] = array('title' => t('You are not allowed to post new content in the forum.'));
}
// The user is not logged-in; and denied access to create any new forum content type.
else {
- $forum_types['login'] = array('title' => t('<a href="@login">Login</a> to post new content in forum.', array('@login' => url('user/login', array('query' => drupal_get_destination())))), 'html' => TRUE);
+ $forum_types['login'] = array('title' => t('<a href="@login">Login</a> to post new content in the forum.', array('@login' => url('user/login', array('query' => drupal_get_destination())))), 'html' => TRUE);
}
}
$variables['links'] = $forum_types;
Modified: branches/upstream/current-6/modules/forum/forum.pages.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/forum/forum.pages.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.pages.inc (original)
+++ branches/upstream/current-6/modules/forum/forum.pages.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: forum.pages.inc,v 1.2 2007/07/26 06:48:03 dries Exp $
+// $Id: forum.pages.inc,v 1.2.2.1 2009/07/01 20:51:55 goba Exp $
/**
* @file
@@ -10,6 +10,11 @@
* Menu callback; prints a forum listing.
*/
function forum_page($tid = 0) {
+ if (!is_numeric($tid)) {
+ return MENU_NOT_FOUND;
+ }
+ $tid = (int)$tid;
+
$topics = '';
$forum_per_page = variable_get('forum_per_page', 25);
$sortby = variable_get('forum_order', 1);
Modified: branches/upstream/current-6/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/help/help.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/help/help.info (original)
+++ branches/upstream/current-6/modules/help/help.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/locale/locale.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/locale/locale.info (original)
+++ branches/upstream/current-6/modules/locale/locale.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/menu/menu.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/menu/menu.info (original)
+++ branches/upstream/current-6/modules/menu/menu.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/node/node.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/node/node.admin.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.admin.inc (original)
+++ branches/upstream/current-6/modules/node/node.admin.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: node.admin.inc,v 1.19.2.2 2008/11/10 10:31:06 goba Exp $
+// $Id: node.admin.inc,v 1.19.2.3 2009/06/08 16:45:34 goba Exp $
/**
* @file
@@ -10,24 +10,19 @@
* Menu callback; presents general node configuration options.
*/
function node_configure() {
- // Only show rebuild button if there are either 0, or 2 or more, rows
- // in the {node_access} table, or if there are modules that
- // implement hook_node_grants().
- if (db_result(db_query('SELECT COUNT(*) FROM {node_access}')) != 1 || count(module_implements('node_grants')) > 0) {
- $status = '<p>'. t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Possible causes for permission problems are disabling modules or configuration changes to permissions. Rebuilding will remove all privileges to posts, and replace them with permissions based on the current modules and settings.') .'</p>';
- $status .= '<p>'. t('Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed posts will automatically use the new permissions.') .'</p>';
-
- $form['access'] = array(
- '#type' => 'fieldset',
- '#title' => t('Node access status'),
- );
- $form['access']['status'] = array('#value' => $status);
- $form['access']['rebuild'] = array(
- '#type' => 'submit',
- '#value' => t('Rebuild permissions'),
- '#submit' => array('node_configure_access_submit'),
- );
- }
+ $status = '<p>'. t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Possible causes for permission problems are disabling modules or configuration changes to permissions. Rebuilding will remove all privileges to posts, and replace them with permissions based on the current modules and settings.') .'</p>';
+ $status .= '<p>'. t('Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed posts will automatically use the new permissions.') .'</p>';
+
+ $form['access'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Node access status'),
+ );
+ $form['access']['status'] = array('#value' => $status);
+ $form['access']['rebuild'] = array(
+ '#type' => 'submit',
+ '#value' => t('Rebuild permissions'),
+ '#submit' => array('node_configure_access_submit'),
+ );
$form['default_nodes_main'] = array(
'#type' => 'select', '#title' => t('Number of posts on main page'), '#default_value' => variable_get('default_nodes_main', 10),
Modified: branches/upstream/current-6/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/node/node.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.info (original)
+++ branches/upstream/current-6/modules/node/node.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/openid/openid.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/openid/openid.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/openid/openid.info (original)
+++ branches/upstream/current-6/modules/openid/openid.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/openid/openid.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/openid/openid.module?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/openid/openid.module (original)
+++ branches/upstream/current-6/modules/openid/openid.module Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: openid.module,v 1.19.2.5 2009/03/30 11:36:47 goba Exp $
+// $Id: openid.module,v 1.19.2.6 2009/06/10 14:05:23 goba Exp $
/**
* @file
@@ -44,8 +44,8 @@
function openid_help($path, $arg) {
switch ($path) {
case 'user/%/openid':
- $output = '<p>'. t('This site supports <a href="@openid-net">OpenID</a>, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => url('http://openid.net'))) .'</p>';
- $output .= '<p>'. t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the <a href="@openid-providers">free public providers</a>. You can find out more about OpenID at <a href="@openid-net">this website</a>.', array('@openid-providers' => url('http://openid.net/wiki/index.php/OpenIDServers'), '@openid-net' => url('http://openid.net'))) .'</p>';
+ $output = '<p>'. t('This site supports <a href="@openid-net">OpenID</a>, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => 'http://openid.net')) .'</p>';
+ $output .= '<p>'. t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the <a href="@openid-providers">free public providers</a>. You can find out more about OpenID at <a href="@openid-net">this website</a>.', array('@openid-providers' => 'http://openid.net/get/', '@openid-net' => 'http://openid.net')) .'</p>';
$output .= '<p>'. t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you login, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') .'</p>';
return $output;
Modified: branches/upstream/current-6/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/path/path.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/path/path.info (original)
+++ branches/upstream/current-6/modules/path/path.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/php/php.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/php/php.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/php/php.info (original)
+++ branches/upstream/current-6/modules/php/php.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/ping/ping.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/ping/ping.info (original)
+++ branches/upstream/current-6/modules/ping/ping.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/poll/poll.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/poll/poll.info (original)
+++ branches/upstream/current-6/modules/poll/poll.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/profile/profile.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/profile/profile.info (original)
+++ branches/upstream/current-6/modules/profile/profile.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/search/search.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.info (original)
+++ branches/upstream/current-6/modules/search/search.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/statistics/statistics.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/statistics/statistics.info (original)
+++ branches/upstream/current-6/modules/statistics/statistics.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/syslog/syslog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/syslog/syslog.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/syslog/syslog.info (original)
+++ branches/upstream/current-6/modules/syslog/syslog.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/system/system.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.admin.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.admin.inc (original)
+++ branches/upstream/current-6/modules/system/system.admin.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: system.admin.inc,v 1.63.2.7 2009/02/25 11:38:41 goba Exp $
+// $Id: system.admin.inc,v 1.63.2.8 2009/06/09 10:58:09 goba Exp $
/**
* @file
@@ -1357,7 +1357,7 @@
*
* @ingroup forms
*/
-function system_clear_cache_submit(&$form_state, $form) {
+function system_clear_cache_submit($form, &$form_state) {
drupal_flush_all_caches();
drupal_set_message(t('Caches cleared.'));
}
Modified: branches/upstream/current-6/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.info (original)
+++ branches/upstream/current-6/modules/system/system.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/system/system.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.install?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.install (original)
+++ branches/upstream/current-6/modules/system/system.install Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: system.install,v 1.238.2.14 2009/04/27 12:50:13 goba Exp $
+// $Id: system.install,v 1.238.2.15 2009/07/01 20:51:56 goba Exp $
/**
* Test and report Drupal installation requirements.
@@ -2565,6 +2565,39 @@
}
/**
+ * Create a signature_format column.
+ */
+function system_update_6051() {
+ $ret = array();
+
+ if (!db_column_exists('users', 'signature_format')) {
+
+ // Set future input formats to FILTER_FORMAT_DEFAULT to ensure a safe default
+ // when incompatible modules insert into the users table. An actual format
+ // will be assigned when users save their signature.
+
+ $schema = array(
+ 'type' => 'int',
+ 'size' => 'small',
+ 'not null' => TRUE,
+ 'default' => FILTER_FORMAT_DEFAULT,
+ 'description' => 'The {filter_formats}.format of the signature.',
+ );
+
+ db_add_field($ret, 'users', 'signature_format', $schema);
+
+ // Set the format of existing signatures to the current default input format.
+ if ($current_default_filter = variable_get('filter_default_format', 0)) {
+ $ret[] = update_sql("UPDATE {users} SET signature_format = ". $current_default_filter);
+ }
+
+ drupal_set_message("User signatures no longer inherit comment input formats. Each user's signature now has its own associated format that can be selected on the user's account page. Existing signatures have been set to your site's default input format.");
+ }
+
+ return $ret;
+}
+
+/**
* @} End of "defgroup updates-6.x-extra"
* The next series of updates should start at 7000.
*/
Modified: branches/upstream/current-6/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.module?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.module (original)
+++ branches/upstream/current-6/modules/system/system.module Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: system.module,v 1.585.2.36 2009/05/13 19:11:04 goba Exp $
+// $Id: system.module,v 1.585.2.38 2009/07/01 20:51:56 goba Exp $
/**
* @file
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.12');
+define('VERSION', '6.13');
/**
* Core API compatibility.
Modified: branches/upstream/current-6/modules/taxonomy/taxonomy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/taxonomy/taxonomy.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/throttle/throttle.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/throttle/throttle.info (original)
+++ branches/upstream/current-6/modules/throttle/throttle.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/tracker/tracker.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/tracker/tracker.info (original)
+++ branches/upstream/current-6/modules/tracker/tracker.info Mon Jul 13 16:40:43 2009
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/translation/translation.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/translation/translation.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/translation/translation.info (original)
+++ branches/upstream/current-6/modules/translation/translation.info Mon Jul 13 16:40:43 2009
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/trigger/trigger.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/trigger/trigger.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/trigger/trigger.info (original)
+++ branches/upstream/current-6/modules/trigger/trigger.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/trigger/trigger.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/trigger/trigger.module?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/trigger/trigger.module (original)
+++ branches/upstream/current-6/modules/trigger/trigger.module Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: trigger.module,v 1.13.2.2 2009/03/30 11:53:09 goba Exp $
+// $Id: trigger.module,v 1.13.2.3 2009/06/08 16:34:57 goba Exp $
/**
* @file
@@ -313,10 +313,10 @@
* Implementation of hook_cron().
*/
function trigger_cron() {
- $aids = _trigger_get_hook_aids('cron');
+ $aids = _trigger_get_hook_aids('cron', 'run');
$context = array(
'hook' => 'cron',
- 'op' => '',
+ 'op' => 'run',
);
// Cron does not act on any specific object.
$object = NULL;
Modified: branches/upstream/current-6/modules/update/update.compare.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.compare.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.compare.inc (original)
+++ branches/upstream/current-6/modules/update/update.compare.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: update.compare.inc,v 1.8.2.3 2009/04/29 18:43:11 goba Exp $
+// $Id: update.compare.inc,v 1.8.2.5 2009/06/09 11:08:32 goba Exp $
/**
* @file
@@ -38,6 +38,8 @@
// Still empty, so we have to rebuild the cache.
_update_process_info_list($projects, module_rebuild_cache(), 'module');
_update_process_info_list($projects, system_theme_data(), 'theme');
+ // Allow other modules to alter projects before fetching and comparing.
+ drupal_alter('update_projects', $projects);
// Cache the site's project data for at most 1 hour.
_update_cache_set('update_project_projects', $projects, time() + 3600);
}
@@ -301,6 +303,11 @@
'data' => t('This project is no longer supported, and is no longer available for download. Disabling everything included by this project is strongly recommended!'),
);
break;
+ case 'not-fetched':
+ $projects[$project]['status'] = UPDATE_NOT_FETCHED;
+ $projects[$project]['reason'] = t('Failed to fetch available update data');
+ break;
+
default:
// Assume anything else (e.g. 'published') is valid and we should
// perform the rest of the logic in this function.
Modified: branches/upstream/current-6/modules/update/update.fetch.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.fetch.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.fetch.inc (original)
+++ branches/upstream/current-6/modules/update/update.fetch.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: update.fetch.inc,v 1.7.2.4 2009/04/29 18:43:11 goba Exp $
+// $Id: update.fetch.inc,v 1.7.2.6 2009/06/09 11:08:32 goba Exp $
/**
* @file
@@ -11,7 +11,7 @@
*/
function update_manual_status() {
if (_update_refresh()) {
- drupal_set_message(t('Fetched information about all available new releases and updates.'));
+ drupal_set_message(t('Attempted to fetch information about all available new releases and updates.'));
}
else {
drupal_set_message(t('Unable to fetch any information about available new releases and updates.'), 'error');
@@ -23,6 +23,7 @@
* Fetch project info via XML from a central server.
*/
function _update_refresh() {
+ static $fail = array();
global $base_url;
module_load_include('inc', 'update', 'update.compare');
@@ -44,12 +45,24 @@
// available release data, since even if we fail to fetch new data, we need
// to clear out the stale data at this point.
_update_cache_clear('update_available_releases');
+ $max_fetch_attempts = variable_get('update_max_fetch_attempts', UPDATE_MAX_FETCH_ATTEMPTS);
foreach ($projects as $key => $project) {
$url = _update_build_fetch_url($project, $site_key);
- $xml = drupal_http_request($url);
- if (isset($xml->data)) {
- $data[] = $xml->data;
+ $fetch_url_base = _update_get_fetch_url_base($project);
+ if (empty($fail[$fetch_url_base]) || count($fail[$fetch_url_base]) < $max_fetch_attempts) {
+ $xml = drupal_http_request($url);
+ if (isset($xml->data)) {
+ $data[] = $xml->data;
+ }
+ else {
+ // Connection likely broken; prepare to give up.
+ $fail[$fetch_url_base][$key] = 1;
+ }
+ }
+ else {
+ // Didn't bother trying to fetch.
+ $fail[$fetch_url_base][$key] = 1;
}
}
@@ -58,14 +71,21 @@
$available = $parser->parse($data);
}
if (!empty($available) && is_array($available)) {
+ // Record the projects where we failed to fetch data.
+ foreach ($fail as $fetch_url_base => $failures) {
+ foreach ($failures as $key => $value) {
+ $available[$key]['project_status'] = 'not-fetched';
+ }
+ }
$frequency = variable_get('update_check_frequency', 1);
_update_cache_set('update_available_releases', $available, time() + (60 * 60 * 24 * $frequency));
- variable_set('update_last_check', time());
- watchdog('update', 'Fetched information about all available new releases and updates.', array(), WATCHDOG_NOTICE, l(t('view'), 'admin/reports/updates'));
+ watchdog('update', 'Attempted to fetch information about all available new releases and updates.', array(), WATCHDOG_NOTICE, l(t('view'), 'admin/reports/updates'));
}
else {
watchdog('update', 'Unable to fetch any information about available new releases and updates.', array(), WATCHDOG_ERROR, l(t('view'), 'admin/reports/updates'));
}
+ // Whether this worked or not, we did just (try to) check for updates.
+ variable_set('update_last_check', time());
return $available;
}
@@ -85,14 +105,13 @@
* @see update_get_projects()
*/
function _update_build_fetch_url($project, $site_key = '') {
- $default_url = variable_get('update_fetch_url', UPDATE_DEFAULT_URL);
- if (!isset($project['info']['project status url'])) {
- $project['info']['project status url'] = $default_url;
- }
$name = $project['name'];
- $url = $project['info']['project status url'];
+ $url = _update_get_fetch_url_base($project);
$url .= '/'. $name .'/'. DRUPAL_CORE_COMPATIBILITY;
- if (!empty($site_key)) {
+ // Only append a site_key and the version information if we have a site_key
+ // in the first place, and if this is not a disabled module or theme. We do
+ // not want to record usage statistics for disabled code.
+ if (!empty($site_key) && (strpos($project['project_type'], 'disabled') === FALSE)) {
$url .= (strpos($url, '?') === TRUE) ? '&' : '?';
$url .= 'site_key=';
$url .= drupal_urlencode($site_key);
@@ -102,6 +121,22 @@
}
}
return $url;
+}
+
+/**
+ * Return the base of the URL to fetch available update data for a project.
+ *
+ * @param $project
+ * The array of project information from update_get_projects().
+ * @return
+ * The base of the URL used for fetching available update data. This does
+ * not include the path elements to specify a particular project, version,
+ * site_key, etc.
+ *
+ * @see _update_build_fetch_url()
+ */
+function _update_get_fetch_url_base($project) {
+ return isset($project['info']['project status url']) ? $project['info']['project status url'] : variable_get('update_fetch_url', UPDATE_DEFAULT_URL);
}
/**
Modified: branches/upstream/current-6/modules/update/update.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.info (original)
+++ branches/upstream/current-6/modules/update/update.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/update/update.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.module?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.module (original)
+++ branches/upstream/current-6/modules/update/update.module Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: update.module,v 1.17.2.4 2009/05/13 18:27:58 goba Exp $
+// $Id: update.module,v 1.17.2.5 2009/06/09 11:08:32 goba Exp $
/**
* @file
@@ -51,6 +51,15 @@
*/
define('UPDATE_UNKNOWN', -2);
+/**
+ * There was a failure fetching available update data for this project.
+ */
+define('UPDATE_NOT_FETCHED', -3);
+
+/**
+ * Maximum number of attempts to fetch available update data from a given host.
+ */
+define('UPDATE_MAX_FETCH_ATTEMPTS', 2);
/**
* Implementation of hook_help().
@@ -267,6 +276,7 @@
break;
case UPDATE_UNKNOWN:
case UPDATE_NOT_CHECKED:
+ case UPDATE_NOT_FETCHED:
$requirement_label = isset($project['reason']) ? $project['reason'] : t('Can not determine status');
$requirement['severity'] = REQUIREMENT_WARNING;
break;
@@ -464,6 +474,7 @@
case UPDATE_UNKNOWN:
case UPDATE_NOT_CHECKED:
+ case UPDATE_NOT_FETCHED:
if ($msg_type == 'core') {
$text = t('There was a problem determining the status of available updates for your version of Drupal.', array(), $langcode);
}
Modified: branches/upstream/current-6/modules/update/update.report.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.report.inc?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.report.inc (original)
+++ branches/upstream/current-6/modules/update/update.report.inc Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: update.report.inc,v 1.10.2.3 2009/04/29 17:17:21 goba Exp $
+// $Id: update.report.inc,v 1.10.2.4 2009/06/09 11:08:32 goba Exp $
/**
* @file
@@ -48,6 +48,7 @@
$icon = theme('image', 'misc/watchdog-ok.png', t('ok'), t('ok'));
break;
case UPDATE_UNKNOWN:
+ case UPDATE_NOT_FETCHED:
$class = 'unknown';
$icon = theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning'));
break;
Modified: branches/upstream/current-6/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/upload/upload.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/upload/upload.info (original)
+++ branches/upstream/current-6/modules/upload/upload.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.info (original)
+++ branches/upstream/current-6/modules/user/user.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/modules/user/user.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.install?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.install (original)
+++ branches/upstream/current-6/modules/user/user.install Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: user.install,v 1.5.2.1 2009/01/06 15:46:38 goba Exp $
+// $Id: user.install,v 1.5.2.2 2009/07/01 20:51:56 goba Exp $
/**
* Implementation of hook_schema().
@@ -191,6 +191,13 @@
'default' => '',
'description' => "User's signature.",
),
+ 'signature_format' => array(
+ 'type' => 'int',
+ 'size' => 'small',
+ 'not null' => TRUE,
+ 'default' => 0,
+ 'description' => 'The {filter_formats}.format of the signature.',
+ ),
'created' => array(
'type' => 'int',
'not null' => TRUE,
Modified: branches/upstream/current-6/modules/user/user.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.module?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.module (original)
+++ branches/upstream/current-6/modules/user/user.module Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.892.2.13 2009/04/27 12:02:27 goba Exp $
+// $Id: user.module,v 1.892.2.14 2009/07/01 20:51:56 goba Exp $
/**
* @file
@@ -532,7 +532,7 @@
}
else {
// Make sure we return the default fields at least.
- $fields = array('uid', 'name', 'pass', 'mail', 'picture', 'mode', 'sort', 'threshold', 'theme', 'signature', 'created', 'access', 'login', 'status', 'timezone', 'language', 'init', 'data');
+ $fields = array('uid', 'name', 'pass', 'mail', 'picture', 'mode', 'sort', 'threshold', 'theme', 'signature', 'signature_format', 'created', 'access', 'login', 'status', 'timezone', 'language', 'init', 'data');
}
}
@@ -1519,6 +1519,15 @@
'#default_value' => $edit['signature'],
'#description' => t('Your signature will be publicly displayed at the end of your comments.'),
);
+
+ // Prevent a "validation error" message when the user attempts to save with a default value they
+ // do not have access to.
+ if (!filter_access($edit['signature_format']) && empty($_POST)) {
+ drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page."));
+ $edit['signature_format'] = FILTER_FORMAT_DEFAULT;
+ }
+
+ $form['signature_settings']['signature_format'] = filter_form($edit['signature_format'], NULL, array('signature_format'));
}
// Picture/avatar:
@@ -2031,7 +2040,7 @@
// Validate signature.
if ($op == 'view') {
if (variable_get('user_signatures', 0) && !empty($comment->signature)) {
- $comment->signature = check_markup($comment->signature, $comment->format);
+ $comment->signature = check_markup($comment->signature, $comment->signature_format, FALSE);
}
else {
$comment->signature = '';
Modified: branches/upstream/current-6/sites/default/default.settings.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/sites/default/default.settings.php?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/sites/default/default.settings.php (original)
+++ branches/upstream/current-6/sites/default/default.settings.php Mon Jul 13 16:40:43 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: default.settings.php,v 1.8.2.1 2008/08/13 06:52:36 dries Exp $
+// $Id: default.settings.php,v 1.8.2.2 2009/06/09 10:44:55 goba Exp $
/**
* @file
@@ -142,6 +142,7 @@
ini_set('session.cookie_lifetime', 2000000);
ini_set('session.gc_maxlifetime', 200000);
ini_set('session.save_handler', 'user');
+ini_set('session.use_cookies', 1);
ini_set('session.use_only_cookies', 1);
ini_set('session.use_trans_sid', 0);
ini_set('url_rewriter.tags', '');
Modified: branches/upstream/current-6/themes/bluemarine/bluemarine.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/bluemarine/bluemarine.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/themes/bluemarine/bluemarine.info (original)
+++ branches/upstream/current-6/themes/bluemarine/bluemarine.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/themes/chameleon/chameleon.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/chameleon/chameleon.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/chameleon.info (original)
+++ branches/upstream/current-6/themes/chameleon/chameleon.info Mon Jul 13 16:40:43 2009
@@ -12,8 +12,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/themes/chameleon/marvin/marvin.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/chameleon/marvin/marvin.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/marvin/marvin.info (original)
+++ branches/upstream/current-6/themes/chameleon/marvin/marvin.info Mon Jul 13 16:40:43 2009
@@ -7,8 +7,8 @@
core = 6.x
base theme = chameleon
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/themes/garland/garland.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/garland.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/garland.info (original)
+++ branches/upstream/current-6/themes/garland/garland.info Mon Jul 13 16:40:43 2009
@@ -7,8 +7,8 @@
stylesheets[all][] = style.css
stylesheets[print][] = print.css
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/themes/garland/minnelli/minnelli.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/minnelli/minnelli.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/minnelli/minnelli.info (original)
+++ branches/upstream/current-6/themes/garland/minnelli/minnelli.info Mon Jul 13 16:40:43 2009
@@ -6,8 +6,8 @@
base theme = garland
stylesheets[all][] = minnelli.css
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
Modified: branches/upstream/current-6/themes/pushbutton/pushbutton.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/pushbutton/pushbutton.info?rev=2065&op=diff
==============================================================================
--- branches/upstream/current-6/themes/pushbutton/pushbutton.info (original)
+++ branches/upstream/current-6/themes/pushbutton/pushbutton.info Mon Jul 13 16:40:43 2009
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2009-05-13
-version = "6.12"
+; Information added by drupal.org packaging script on 2009-07-01
+version = "6.13"
project = "drupal"
-datestamp = "1242243950"
+datestamp = "1246481719"
More information about the Pkg-drupal-commits
mailing list