[Pkg-drupal-commits] r2042 - in /branches/drupal6: ./ debian/ includes/ 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/ 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
Tue Jun 2 16:27:14 UTC 2009
Author: luigi
Date: Tue Jun 2 16:27:14 2009
New Revision: 2042
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2042
Log:
New upstream release
Modified:
branches/drupal6/CHANGELOG.txt
branches/drupal6/debian/changelog
branches/drupal6/includes/common.inc
branches/drupal6/includes/form.inc
branches/drupal6/includes/theme.inc
branches/drupal6/modules/aggregator/aggregator.info
branches/drupal6/modules/block/block.info
branches/drupal6/modules/blog/blog.info
branches/drupal6/modules/blogapi/blogapi.info
branches/drupal6/modules/book/book-export-html.tpl.php
branches/drupal6/modules/book/book.info
branches/drupal6/modules/color/color.info
branches/drupal6/modules/comment/comment.info
branches/drupal6/modules/comment/comment.module
branches/drupal6/modules/contact/contact.info
branches/drupal6/modules/dblog/dblog.info
branches/drupal6/modules/filter/filter.info
branches/drupal6/modules/forum/forum.info
branches/drupal6/modules/help/help.info
branches/drupal6/modules/locale/locale.info
branches/drupal6/modules/menu/menu.info
branches/drupal6/modules/node/node.info
branches/drupal6/modules/openid/openid.info
branches/drupal6/modules/path/path.info
branches/drupal6/modules/php/php.info
branches/drupal6/modules/ping/ping.info
branches/drupal6/modules/poll/poll.info
branches/drupal6/modules/profile/profile.info
branches/drupal6/modules/search/search.info
branches/drupal6/modules/statistics/statistics.info
branches/drupal6/modules/syslog/syslog.info
branches/drupal6/modules/system/system.info
branches/drupal6/modules/system/system.module
branches/drupal6/modules/taxonomy/taxonomy.info
branches/drupal6/modules/taxonomy/taxonomy.module
branches/drupal6/modules/throttle/throttle.info
branches/drupal6/modules/tracker/tracker.info
branches/drupal6/modules/translation/translation.info
branches/drupal6/modules/trigger/trigger.info
branches/drupal6/modules/update/update.info
branches/drupal6/modules/update/update.module
branches/drupal6/modules/upload/upload.info
branches/drupal6/modules/user/user.info
branches/drupal6/themes/bluemarine/bluemarine.info
branches/drupal6/themes/chameleon/chameleon.info
branches/drupal6/themes/chameleon/marvin/marvin.info
branches/drupal6/themes/garland/garland.info
branches/drupal6/themes/garland/minnelli/minnelli.info
branches/drupal6/themes/pushbutton/pushbutton.info
Modified: branches/drupal6/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/CHANGELOG.txt?rev=2042&op=diff
==============================================================================
--- branches/drupal6/CHANGELOG.txt (original)
+++ branches/drupal6/CHANGELOG.txt Tue Jun 2 16:27:14 2009
@@ -1,4 +1,9 @@
-// $Id: CHANGELOG.txt,v 1.253.2.27 2009/04/30 00:13:30 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.29 2009/05/13 19:11:04 goba Exp $
+
+Drupal 6.12, 2009-05-13
+----------------------
+- Fixed security issues (Cross site scripting), see SA-CORE-2009-006.
+- Fixed a variety of small bugs.
Drupal 6.11, 2009-04-29
----------------------
@@ -181,6 +186,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.18, 2009-05-13
+----------------------
+- Fixed security issues (Cross site scripting), see SA-CORE-2009-006.
+- Fixed a variety of small bugs.
+
Drupal 5.17, 2009-04-29
-----------------------
- Fixed security issues (Cross site scripting and limited information disclosure) see SA-CORE-2009-005.
Modified: branches/drupal6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/changelog?rev=2042&op=diff
==============================================================================
--- branches/drupal6/debian/changelog (original)
+++ branches/drupal6/debian/changelog Tue Jun 2 16:27:14 2009
@@ -1,3 +1,10 @@
+drupal6 (6.18-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ (Acknoledges NMU by Security Team)
+
+ -- Luigi Gangitano <luigi at debian.org> Tue, 02 Jun 2009 18:25:58 +0200
+
drupal6 (6.11-1.1) unstable; urgency=high
* Non-maintainer upload by the Security Team.
Modified: branches/drupal6/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/common.inc?rev=2042&op=diff
==============================================================================
--- branches/drupal6/includes/common.inc (original)
+++ branches/drupal6/includes/common.inc Tue Jun 2 16:27:14 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.756.2.49 2009/04/30 00:13:30 goba Exp $
+// $Id: common.inc,v 1.756.2.52 2009/05/13 19:11:04 goba Exp $
/**
* @file
@@ -352,11 +352,6 @@
watchdog('page not found', check_plain($_GET['q']), NULL, WATCHDOG_WARNING);
- // Keep old path for reference.
- if (!isset($_REQUEST['destination'])) {
- $_REQUEST['destination'] = $_GET['q'];
- }
-
$path = drupal_get_normal_path(variable_get('site_404', ''));
if ($path && $path != $_GET['q']) {
// Set the active item in case there are tabs to display, or other
@@ -379,12 +374,8 @@
*/
function drupal_access_denied() {
drupal_set_header('HTTP/1.1 403 Forbidden');
+
watchdog('access denied', check_plain($_GET['q']), NULL, WATCHDOG_WARNING);
-
- // Keep old path for reference.
- if (!isset($_REQUEST['destination'])) {
- $_REQUEST['destination'] = $_GET['q'];
- }
$path = drupal_get_normal_path(variable_get('site_403', ''));
if ($path && $path != $_GET['q']) {
Modified: branches/drupal6/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/form.inc?rev=2042&op=diff
==============================================================================
--- branches/drupal6/includes/form.inc (original)
+++ branches/drupal6/includes/form.inc Tue Jun 2 16:27:14 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.265.2.23 2009/04/27 14:41:11 goba Exp $
+// $Id: form.inc,v 1.265.2.24 2009/05/13 18:22:29 goba Exp $
/**
* @defgroup forms Form builder functions
@@ -624,12 +624,6 @@
}
if (!isset($goto) || ($goto !== FALSE)) {
if (isset($goto)) {
- // Remove any fake destination set by drupal_not_found() or
- // drupal_access_denied() so that we can properly redirect from those
- // pages.
- if (isset($_REQUEST['destination']) && $_REQUEST['destination'] == $_GET['q']) {
- unset($_REQUEST['destination']);
- }
if (is_array($goto)) {
call_user_func_array('drupal_goto', $goto);
}
Modified: branches/drupal6/includes/theme.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/theme.inc?rev=2042&op=diff
==============================================================================
--- branches/drupal6/includes/theme.inc (original)
+++ branches/drupal6/includes/theme.inc Tue Jun 2 16:27:14 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: theme.inc,v 1.415.2.21 2009/04/30 00:13:30 goba Exp $
+// $Id: theme.inc,v 1.415.2.22 2009/05/13 19:11:04 goba Exp $
/**
* @file
@@ -688,7 +688,7 @@
// restore path_to_theme()
$theme_path = $temp;
// Add final markup to the full page.
- if ($hook == 'page') {
+ if ($hook == 'page' || $hook == 'book_export_html') {
$output = drupal_final_markup($output);
}
return $output;
Modified: branches/drupal6/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/aggregator/aggregator.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/aggregator/aggregator.info (original)
+++ branches/drupal6/modules/aggregator/aggregator.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/block/block.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/block/block.info (original)
+++ branches/drupal6/modules/block/block.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/blog/blog.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/blog/blog.info (original)
+++ branches/drupal6/modules/blog/blog.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/blogapi/blogapi.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/blogapi/blogapi.info (original)
+++ branches/drupal6/modules/blogapi/blogapi.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/book/book-export-html.tpl.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/book/book-export-html.tpl.php?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/book/book-export-html.tpl.php (original)
+++ branches/drupal6/modules/book/book-export-html.tpl.php Tue Jun 2 16:27:14 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: book-export-html.tpl.php,v 1.1 2007/11/04 14:29:09 goba Exp $
+// $Id: book-export-html.tpl.php,v 1.1.2.1 2009/05/13 19:11:04 goba Exp $
/**
* @file book-export-html.tpl.php
@@ -20,8 +20,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language; ?>" xml:lang="<?php print $language->language; ?>">
<head>
+ <?php print $head; ?>
<title><?php print $title; ?></title>
- <?php print $head; ?>
<base href="<?php print $base_url; ?>" />
<link type="text/css" rel="stylesheet" href="misc/print.css" />
<?php if ($language_rtl): ?>
Modified: branches/drupal6/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/book/book.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/book/book.info (original)
+++ branches/drupal6/modules/book/book.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/color/color.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/color/color.info (original)
+++ branches/drupal6/modules/color/color.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/comment/comment.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/comment/comment.info (original)
+++ branches/drupal6/modules/comment/comment.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/comment/comment.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/comment/comment.module?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/comment/comment.module (original)
+++ branches/drupal6/modules/comment/comment.module Tue Jun 2 16:27:14 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: comment.module,v 1.617.2.6 2009/04/05 12:04:52 dries Exp $
+// $Id: comment.module,v 1.617.2.7 2009/05/13 17:15:10 goba Exp $
/**
* @file
@@ -1541,7 +1541,9 @@
_comment_form_submit($form_state['values']);
if ($cid = comment_save($form_state['values'])) {
$node = node_load($form_state['values']['nid']);
- $page = comment_new_page_count($node->comment_count, 1, $node);
+ // Add 1 to existing $node->comment count to include new comment being added.
+ $comment_count = $node->comment_count + 1;
+ $page = comment_new_page_count($comment_count, 1, $node);
$form_state['redirect'] = array('node/'. $node->nid, $page, "comment-$cid");
return;
}
Modified: branches/drupal6/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/contact/contact.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/contact/contact.info (original)
+++ branches/drupal6/modules/contact/contact.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/dblog/dblog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/dblog/dblog.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/dblog/dblog.info (original)
+++ branches/drupal6/modules/dblog/dblog.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/filter/filter.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/filter/filter.info (original)
+++ branches/drupal6/modules/filter/filter.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/forum/forum.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/forum/forum.info (original)
+++ branches/drupal6/modules/forum/forum.info Tue Jun 2 16:27:14 2009
@@ -7,8 +7,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/help/help.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/help/help.info (original)
+++ branches/drupal6/modules/help/help.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/locale/locale.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/locale/locale.info (original)
+++ branches/drupal6/modules/locale/locale.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/menu/menu.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/menu/menu.info (original)
+++ branches/drupal6/modules/menu/menu.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/node/node.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/node/node.info (original)
+++ branches/drupal6/modules/node/node.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/openid/openid.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/openid/openid.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/openid/openid.info (original)
+++ branches/drupal6/modules/openid/openid.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/path/path.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/path/path.info (original)
+++ branches/drupal6/modules/path/path.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/php/php.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/php/php.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/php/php.info (original)
+++ branches/drupal6/modules/php/php.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/ping/ping.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/ping/ping.info (original)
+++ branches/drupal6/modules/ping/ping.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/poll/poll.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/poll/poll.info (original)
+++ branches/drupal6/modules/poll/poll.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/profile/profile.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/profile/profile.info (original)
+++ branches/drupal6/modules/profile/profile.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/search/search.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/search/search.info (original)
+++ branches/drupal6/modules/search/search.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/statistics/statistics.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/statistics/statistics.info (original)
+++ branches/drupal6/modules/statistics/statistics.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/syslog/syslog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/syslog/syslog.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/syslog/syslog.info (original)
+++ branches/drupal6/modules/syslog/syslog.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/system/system.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/system/system.info (original)
+++ branches/drupal6/modules/system/system.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/system/system.module?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/system/system.module (original)
+++ branches/drupal6/modules/system/system.module Tue Jun 2 16:27:14 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: system.module,v 1.585.2.34 2009/04/30 00:13:31 goba Exp $
+// $Id: system.module,v 1.585.2.36 2009/05/13 19:11:04 goba Exp $
/**
* @file
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.11');
+define('VERSION', '6.12');
/**
* Core API compatibility.
Modified: branches/drupal6/modules/taxonomy/taxonomy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/taxonomy/taxonomy.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/taxonomy/taxonomy.info (original)
+++ branches/drupal6/modules/taxonomy/taxonomy.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/taxonomy/taxonomy.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/taxonomy/taxonomy.module?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/taxonomy/taxonomy.module (original)
+++ branches/drupal6/modules/taxonomy/taxonomy.module Tue Jun 2 16:27:14 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.module,v 1.414.2.8 2009/04/27 11:49:05 goba Exp $
+// $Id: taxonomy.module,v 1.414.2.11 2009/05/13 19:38:33 goba Exp $
/**
* @file
@@ -415,7 +415,7 @@
*/
function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
$vocabulary = taxonomy_vocabulary_load($vid);
- $help = ($help) ? $help : $vocabulary->help;
+ $help = ($help) ? $help : filter_xss_admin($vocabulary->help);
if (!$vocabulary->multiple) {
$blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -');
@@ -514,7 +514,7 @@
$typed_string = taxonomy_implode_tags($terms, $vocabulary->vid) . (array_key_exists('tags', $terms) ? $terms['tags'][$vocabulary->vid] : NULL);
}
if ($vocabulary->help) {
- $help = $vocabulary->help;
+ $help = filter_xss_admin($vocabulary->help);
}
else {
$help = t('A comma-separated list of terms describing this content. Example: funny, bungee jumping, "Company, Inc.".');
@@ -538,7 +538,7 @@
$default_terms[$term->tid] = $term;
}
}
- $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, array_keys($default_terms), $vocabulary->help);
+ $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, array_keys($default_terms), filter_xss_admin($vocabulary->help));
$form['taxonomy'][$vocabulary->vid]['#weight'] = $vocabulary->weight;
$form['taxonomy'][$vocabulary->vid]['#required'] = $vocabulary->required;
}
@@ -838,19 +838,16 @@
$max_depth = (is_null($max_depth)) ? count($children[$vid]) : $max_depth;
$tree = array();
- if (!empty($children[$vid][$parent])) {
+ if ($max_depth > $depth && !empty($children[$vid][$parent])) {
foreach ($children[$vid][$parent] as $child) {
- if ($max_depth > $depth) {
- $term = drupal_clone($terms[$vid][$child]);
- $term->depth = $depth;
- // The "parent" attribute is not useful, as it would show one parent only.
- unset($term->parent);
- $term->parents = $parents[$vid][$child];
- $tree[] = $term;
-
- if (!empty($children[$vid][$child])) {
- $tree = array_merge($tree, taxonomy_get_tree($vid, $child, $depth, $max_depth));
- }
+ $term = drupal_clone($terms[$vid][$child]);
+ $term->depth = $depth;
+ // The "parent" attribute is not useful, as it would show one parent only.
+ unset($term->parent);
+ $term->parents = $parents[$vid][$child];
+ $tree[] = $term;
+ if (!empty($children[$vid][$child])) {
+ $tree = array_merge($tree, taxonomy_get_tree($vid, $child, $depth, $max_depth));
}
}
}
@@ -1018,6 +1015,35 @@
return $terms[$tid];
}
+/**
+ * Create a select form element for a given taxonomy vocabulary.
+ *
+ * NOTE: This function expects input that has already been sanitized and is
+ * safe for display. Callers must properly sanitize the $title and
+ * $description arguments to prevent XSS vulnerabilities.
+ *
+ * @param $title
+ * The title of the vocabulary. This MUST be sanitized by the caller.
+ * @param $name
+ * Ignored.
+ * @param $value
+ * The currently selected terms from this vocabulary, if any.
+ * @param $vocabulary_id
+ * The vocabulary ID to build the form element for.
+ * @param $description
+ * Help text for the form element. This MUST be sanitized by the caller.
+ * @param $multiple
+ * Boolean to control if the form should use a single or multiple select.
+ * @param $blank
+ * Optional form choice to use when no value has been selected.
+ * @param $exclude
+ * Optional array of term ids to exclude in the selector.
+ * @return
+ * A FAPI form array to select terms from the given vocabulary.
+ *
+ * @see taxonomy_form()
+ * @see taxonomy_form_term()
+ */
function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $description, $multiple, $blank, $exclude = array()) {
$tree = taxonomy_get_tree($vocabulary_id);
$options = array();
Modified: branches/drupal6/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/throttle/throttle.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/throttle/throttle.info (original)
+++ branches/drupal6/modules/throttle/throttle.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/tracker/tracker.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/tracker/tracker.info (original)
+++ branches/drupal6/modules/tracker/tracker.info Tue Jun 2 16:27:14 2009
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/translation/translation.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/translation/translation.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/translation/translation.info (original)
+++ branches/drupal6/modules/translation/translation.info Tue Jun 2 16:27:14 2009
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/trigger/trigger.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/trigger/trigger.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/trigger/trigger.info (original)
+++ branches/drupal6/modules/trigger/trigger.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/update/update.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/update/update.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/update/update.info (original)
+++ branches/drupal6/modules/update/update.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/update/update.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/update/update.module?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/update/update.module (original)
+++ branches/drupal6/modules/update/update.module Tue Jun 2 16:27:14 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: update.module,v 1.17.2.3 2009/04/29 18:43:11 goba Exp $
+// $Id: update.module,v 1.17.2.4 2009/05/13 18:27:58 goba Exp $
/**
* @file
@@ -303,7 +303,7 @@
* @see update_invalidate_cache()
*/
function update_form_alter(&$form, $form_state, $form_id) {
- if ($form_id == 'system_modules' || $form_id == 'system_themes' ) {
+ if ($form_id == 'system_modules' || $form_id == 'system_themes_form' ) {
$form['#submit'][] = 'update_invalidate_cache';
}
}
Modified: branches/drupal6/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/upload/upload.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/upload/upload.info (original)
+++ branches/drupal6/modules/upload/upload.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/user/user.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/modules/user/user.info (original)
+++ branches/drupal6/modules/user/user.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/themes/bluemarine/bluemarine.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/bluemarine/bluemarine.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/themes/bluemarine/bluemarine.info (original)
+++ branches/drupal6/themes/bluemarine/bluemarine.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/themes/chameleon/chameleon.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/chameleon/chameleon.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/themes/chameleon/chameleon.info (original)
+++ branches/drupal6/themes/chameleon/chameleon.info Tue Jun 2 16:27:14 2009
@@ -12,8 +12,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/themes/chameleon/marvin/marvin.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/chameleon/marvin/marvin.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/themes/chameleon/marvin/marvin.info (original)
+++ branches/drupal6/themes/chameleon/marvin/marvin.info Tue Jun 2 16:27:14 2009
@@ -7,8 +7,8 @@
core = 6.x
base theme = chameleon
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/themes/garland/garland.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/garland/garland.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/themes/garland/garland.info (original)
+++ branches/drupal6/themes/garland/garland.info Tue Jun 2 16:27:14 2009
@@ -7,8 +7,8 @@
stylesheets[all][] = style.css
stylesheets[print][] = print.css
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/themes/garland/minnelli/minnelli.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/garland/minnelli/minnelli.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/themes/garland/minnelli/minnelli.info (original)
+++ branches/drupal6/themes/garland/minnelli/minnelli.info Tue Jun 2 16:27:14 2009
@@ -6,8 +6,8 @@
base theme = garland
stylesheets[all][] = minnelli.css
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
Modified: branches/drupal6/themes/pushbutton/pushbutton.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/pushbutton/pushbutton.info?rev=2042&op=diff
==============================================================================
--- branches/drupal6/themes/pushbutton/pushbutton.info (original)
+++ branches/drupal6/themes/pushbutton/pushbutton.info Tue Jun 2 16:27:14 2009
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2009-04-30
-version = "6.11"
+; Information added by drupal.org packaging script on 2009-05-13
+version = "6.12"
project = "drupal"
-datestamp = "1241050838"
+datestamp = "1242243950"
More information about the Pkg-drupal-commits
mailing list