[Pkg-drupal-commits] r1948 - 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
Fri Oct 24 21:09:02 UTC 2008
Author: luigi
Date: Fri Oct 24 21:09:02 2008
New Revision: 1948
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1948
Log:
New upstream release Fixes two security vulnerabilities (Ref: SA-2008-067, CVE-TBA) (Closes: #503222)
Modified:
branches/drupal6/CHANGELOG.txt
branches/drupal6/debian/changelog
branches/drupal6/includes/actions.inc
branches/drupal6/includes/bootstrap.inc
branches/drupal6/includes/common.inc
branches/drupal6/includes/database.inc
branches/drupal6/includes/file.inc
branches/drupal6/includes/form.inc
branches/drupal6/includes/menu.inc
branches/drupal6/includes/path.inc
branches/drupal6/includes/session.inc
branches/drupal6/includes/theme.inc
branches/drupal6/includes/xmlrpc.inc
branches/drupal6/install.php
branches/drupal6/modules/aggregator/aggregator.info
branches/drupal6/modules/block/block.admin.inc
branches/drupal6/modules/block/block.info
branches/drupal6/modules/blog/blog.info
branches/drupal6/modules/blogapi/blogapi.info
branches/drupal6/modules/book/book.admin.inc
branches/drupal6/modules/book/book.info
branches/drupal6/modules/color/color.info
branches/drupal6/modules/comment/comment.info
branches/drupal6/modules/contact/contact.info
branches/drupal6/modules/dblog/dblog.info
branches/drupal6/modules/filter/filter.info
branches/drupal6/modules/forum/forum-topic-list.tpl.php
branches/drupal6/modules/forum/forum.info
branches/drupal6/modules/help/help.info
branches/drupal6/modules/locale/locale.info
branches/drupal6/modules/locale/locale.module
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.admin.inc
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.admin.inc
branches/drupal6/modules/system/system.info
branches/drupal6/modules/system/system.module
branches/drupal6/modules/taxonomy/taxonomy.info
branches/drupal6/modules/throttle/throttle.info
branches/drupal6/modules/tracker/tracker.info
branches/drupal6/modules/translation/translation.info
branches/drupal6/modules/translation/translation.module
branches/drupal6/modules/trigger/trigger.info
branches/drupal6/modules/update/update.info
branches/drupal6/modules/upload/upload.info
branches/drupal6/modules/user/user-profile.tpl.php
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=1948&op=diff
==============================================================================
--- branches/drupal6/CHANGELOG.txt (original)
+++ branches/drupal6/CHANGELOG.txt Fri Oct 24 21:09:02 2008
@@ -1,4 +1,9 @@
-// $Id: CHANGELOG.txt,v 1.253.2.13 2008/10/08 20:12:17 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.15 2008/10/22 19:26:00 goba Exp $
+
+Drupal 6.6, 2008-10-22
+----------------------
+- Fixed security issues, (File inclusion, Cross site scripting), see SA-2008-067
+- Fixed a variety of small bugs.
Drupal 6.5, 2008-10-08
----------------------
@@ -137,6 +142,10 @@
- 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.12, 2008-10-22
+-----------------------
+- fixed security issues, (File inclusion), see SA-2008-067
+
Drupal 5.11, 2008-10-08
-----------------------
- fixed a variety of small bugs.
Modified: branches/drupal6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/changelog?rev=1948&op=diff
==============================================================================
--- branches/drupal6/debian/changelog (original)
+++ branches/drupal6/debian/changelog Fri Oct 24 21:09:02 2008
@@ -1,3 +1,14 @@
+drupal6 (6.6-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET)
+
+ [ Luigi Gangitano ]
+ * New upstream release
+ - Fixes two security vulnerabilities
+ (Ref: SA-2008-067, CVE-TBA) (Closes: #503222)
+
+ -- Luigi Gangitano <luigi at debian.org> Fri, 24 Oct 2008 23:06:15 +0200
+
drupal6 (6.5-1) unstable; urgency=low
[ Luigi Gangitano ]
Modified: branches/drupal6/includes/actions.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/actions.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/actions.inc (original)
+++ branches/drupal6/includes/actions.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: actions.inc,v 1.8.2.4 2008/09/05 09:29:22 dries Exp $
+// $Id: actions.inc,v 1.8.2.5 2008/10/16 12:45:53 goba Exp $
/**
* @file
@@ -298,7 +298,7 @@
}
}
else {
- $link = l(t('Remove orphaned actions'), 'admin/build/actions/orphan');
+ $link = l(t('Remove orphaned actions'), 'admin/settings/actions/orphan');
$count = count($actions_in_db);
watchdog('actions', format_plural($count, 'One orphaned action (%orphans) exists in the actions table. !link', '@count orphaned actions (%orphans) exist in the actions table. !link'), array('@count' => $count, '%orphans' => $orphans, '!link' => $link), WATCHDOG_WARNING);
}
Modified: branches/drupal6/includes/bootstrap.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/bootstrap.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/bootstrap.inc (original)
+++ branches/drupal6/includes/bootstrap.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: bootstrap.inc,v 1.206.2.4 2008/08/18 18:56:30 dries Exp $
+// $Id: bootstrap.inc,v 1.206.2.6 2008/10/22 19:26:01 goba Exp $
/**
* @file
@@ -238,6 +238,11 @@
$confdir = 'sites';
$uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
+ if (strpos($_SERVER['HTTP_HOST'], '/') !== FALSE) {
+ // A HTTP_HOST containing slashes may be an attack and is invalid.
+ header('HTTP/1.1 400 Bad Request');
+ exit;
+ }
$server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
for ($i = count($uri) - 1; $i > 0; $i--) {
for ($j = count($server); $j > 0; $j--) {
@@ -618,7 +623,7 @@
header('HTTP/1.1 304 Not Modified');
// All 304 responses must send an etag if the 200 response for the same object contained an etag
header("Etag: $etag");
- exit();
+ return;
}
// Send appropriate response:
Modified: branches/drupal6/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/common.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/common.inc (original)
+++ branches/drupal6/includes/common.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.756.2.27 2008/10/08 20:12:17 goba Exp $
+// $Id: common.inc,v 1.756.2.29 2008/10/22 19:26:01 goba Exp $
/**
* @file
Modified: branches/drupal6/includes/database.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/database.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/database.inc (original)
+++ branches/drupal6/includes/database.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: database.inc,v 1.92.2.2 2008/07/09 21:48:28 goba Exp $
+// $Id: database.inc,v 1.92.2.3 2008/10/20 09:13:04 goba Exp $
/**
* @file
@@ -172,6 +172,7 @@
*/
function _db_error_page($error = '') {
global $db_type;
+ drupal_init_language();
drupal_maintenance_theme();
drupal_set_header('HTTP/1.1 503 Service Unavailable');
drupal_set_title('Site off-line');
Modified: branches/drupal6/includes/file.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/file.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/file.inc (original)
+++ branches/drupal6/includes/file.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: file.inc,v 1.121.2.4 2008/09/17 08:13:07 goba Exp $
+// $Id: file.inc,v 1.121.2.5 2008/10/20 09:42:31 goba Exp $
/**
* @file
@@ -792,7 +792,9 @@
* @param $headers An array of http headers to send along with file.
*/
function file_transfer($source, $headers) {
- ob_end_clean();
+ if (ob_get_level()) {
+ ob_end_clean();
+ }
foreach ($headers as $header) {
// To prevent HTTP header injection, we delete new lines that are
Modified: branches/drupal6/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/form.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/form.inc (original)
+++ branches/drupal6/includes/form.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.265.2.12 2008/09/23 10:51:16 goba Exp $
+// $Id: form.inc,v 1.265.2.13 2008/10/16 12:43:08 goba Exp $
/**
* @defgroup forms Form builder functions
@@ -2013,7 +2013,7 @@
$extra = '';
$output = '';
- if ($element['#autocomplete_path']) {
+ if ($element['#autocomplete_path'] && menu_valid_path(array('link_path' => $element['#autocomplete_path']))) {
drupal_add_js('misc/autocomplete.js');
$class[] = 'form-autocomplete';
$extra = '<input class="autocomplete" type="hidden" id="'. $element['#id'] .'-autocomplete" value="'. check_url(url($element['#autocomplete_path'], array('absolute' => TRUE))) .'" disabled="disabled" />';
Modified: branches/drupal6/includes/menu.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/menu.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/menu.inc (original)
+++ branches/drupal6/includes/menu.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.inc,v 1.255.2.21 2008/10/08 12:33:55 goba Exp $
+// $Id: menu.inc,v 1.255.2.25 2008/10/22 17:04:12 goba Exp $
/**
* @file
@@ -1265,19 +1265,15 @@
$links = array();
foreach ($tree as $item) {
if (!$item['link']['hidden']) {
+ $class = '';
$l = $item['link']['localized_options'];
$l['href'] = $item['link']['href'];
$l['title'] = $item['link']['title'];
if ($item['link']['in_active_trail']) {
- if (empty($l['attributes']['class'])) {
- $l['attributes']['class'] = 'active-trail';
- }
- else {
- $l['attributes']['class'] .= ' active-trail';
- }
- }
- // Keyed with unique menu id to generate classes from theme_links().
- $links['menu-'. $item['link']['mlid']] = $l;
+ $class = ' active-trail';
+ }
+ // Keyed with the unique mlid to generate classes in theme_links().
+ $links['menu-'. $item['link']['mlid'] . $class] = $l;
}
}
return $links;
@@ -2218,7 +2214,10 @@
// Extract load and to_arg functions.
foreach ($parts as $k => $part) {
$match = FALSE;
- if (preg_match('/^%([a-z_]*)$/', $part, $matches)) {
+ // Look for wildcards in the form allowed to be used in PHP functions,
+ // because we are using these to construct the load function names.
+ // See http://php.net/manual/en/language.functions.php for reference.
+ if (preg_match('/^%(|[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$/', $part, $matches)) {
if (empty($matches[1])) {
$match = TRUE;
$load_functions[$k] = NULL;
@@ -2421,7 +2420,7 @@
// page redirects], and specifically suppress its display on the site
// maintenance page.
if (drupal_get_normal_path($_GET['q']) != 'admin/settings/site-maintenance') {
- drupal_set_message(t('Operating in off-line mode.'), 'status', FALSE);
+ drupal_set_message(l(t('Operating in off-line mode.'), 'admin/settings/site-maintenance'), 'status', FALSE);
}
}
else {
Modified: branches/drupal6/includes/path.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/path.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/path.inc (original)
+++ branches/drupal6/includes/path.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: path.inc,v 1.19 2007/11/04 16:42:45 goba Exp $
+// $Id: path.inc,v 1.19.2.1 2008/10/13 21:06:41 dries Exp $
/**
* @file
@@ -58,6 +58,7 @@
if ($action == 'wipe') {
$map = array();
$no_src = array();
+ $count = NULL;
}
elseif ($count > 0 && $path != '') {
if ($action == 'alias') {
Modified: branches/drupal6/includes/session.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/session.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/session.inc (original)
+++ branches/drupal6/includes/session.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: session.inc,v 1.44.2.3 2008/09/17 07:53:08 goba Exp $
+// $Id: session.inc,v 1.44.2.4 2008/10/20 09:53:32 goba Exp $
/**
* @file
@@ -61,7 +61,7 @@
// the session table. This reduces memory and server load, and gives more useful
// statistics. We can't eliminate anonymous session table rows without breaking
// the throttle module and the "Who's Online" block.
- if (!session_save_session() || (empty($_COOKIE[session_name()]) && empty($value))) {
+ if (!session_save_session() || ($user->uid == 0 && empty($_COOKIE[session_name()]) && empty($value))) {
return TRUE;
}
Modified: branches/drupal6/includes/theme.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/theme.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/theme.inc (original)
+++ branches/drupal6/includes/theme.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: theme.inc,v 1.415.2.12 2008/09/17 08:57:23 goba Exp $
+// $Id: theme.inc,v 1.415.2.13 2008/10/16 13:50:59 dries Exp $
/**
* @file
@@ -693,7 +693,14 @@
}
/**
- * Return the path to the currently selected theme.
+ * Return the path to the current themed element.
+ *
+ * It can point to the active theme or the module handling a themed implementation.
+ * For example, when invoked within the scope of a theming call it will depend
+ * on where the theming function is handled. If implemented from a module, it
+ * will point to the module. If implemented from the active theme, it will point
+ * to the active theme. When called outside the scope of a theming call, it will
+ * always point to the active theme.
*/
function path_to_theme() {
global $theme_path;
Modified: branches/drupal6/includes/xmlrpc.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/xmlrpc.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/includes/xmlrpc.inc (original)
+++ branches/drupal6/includes/xmlrpc.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: xmlrpc.inc,v 1.47.2.3 2008/09/17 06:28:54 goba Exp $
+// $Id: xmlrpc.inc,v 1.47.2.4 2008/10/15 14:04:06 dries Exp $
/**
* @file
@@ -384,13 +384,13 @@
$xmlrpc_date->is_date = TRUE;
// $time can be a PHP timestamp or an ISO one
if (is_numeric($time)) {
- $xmlrpc_date->year = date('Y', $time);
- $xmlrpc_date->month = date('m', $time);
- $xmlrpc_date->day = date('d', $time);
- $xmlrpc_date->hour = date('H', $time);
- $xmlrpc_date->minute = date('i', $time);
- $xmlrpc_date->second = date('s', $time);
- $xmlrpc_date->iso8601 = date('Ymd\TH:i:s', $time);
+ $xmlrpc_date->year = gmdate('Y', $time);
+ $xmlrpc_date->month = gmdate('m', $time);
+ $xmlrpc_date->day = gmdate('d', $time);
+ $xmlrpc_date->hour = gmdate('H', $time);
+ $xmlrpc_date->minute = gmdate('i', $time);
+ $xmlrpc_date->second = gmdate('s', $time);
+ $xmlrpc_date->iso8601 = gmdate('Ymd\TH:i:s', $time);
}
else {
$xmlrpc_date->iso8601 = $time;
Modified: branches/drupal6/install.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/install.php?rev=1948&op=diff
==============================================================================
--- branches/drupal6/install.php (original)
+++ branches/drupal6/install.php Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: install.php,v 1.113.2.6 2008/09/17 08:47:04 goba Exp $
+// $Id: install.php,v 1.113.2.7 2008/10/22 16:31:37 goba Exp $
require_once './includes/install.inc';
@@ -838,7 +838,7 @@
// steps.
module_enable(array($module));
$context['results'][] = $module;
- $context['message'] = 'Installed '. $module_name .' module.';
+ $context['message'] = st('Installed %module module.', array('%module' => $module_name));
}
/**
Modified: branches/drupal6/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/aggregator/aggregator.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/aggregator/aggregator.info (original)
+++ branches/drupal6/modules/aggregator/aggregator.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/block/block.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/block/block.admin.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/block/block.admin.inc (original)
+++ branches/drupal6/modules/block/block.admin.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: block.admin.inc,v 1.14.2.2 2008/06/24 14:40:08 goba Exp $
+// $Id: block.admin.inc,v 1.14.2.3 2008/10/20 13:02:29 dries Exp $
/**
* @file
@@ -302,7 +302,7 @@
foreach (list_themes() as $key => $theme) {
if ($theme->status) {
- db_query("INSERT INTO {blocks} (visibility, pages, custom, title, module, theme, status, weight, delta, cache) VALUES(%d, '%s', %d, '%s', '%s', '%s', %d, %d, %d, %d)", $form_state['values']['visibility'], trim($form_state['values']['pages']), $form_state['values']['custom'], $form_state['values']['title'], $form_state['values']['module'], $theme->name, 0, 0, $delta, BLOCK_NO_CACHE);
+ db_query("INSERT INTO {blocks} (visibility, pages, custom, title, module, theme, status, weight, delta, cache) VALUES(%d, '%s', %d, '%s', '%s', '%s', %d, %d, '%s', %d)", $form_state['values']['visibility'], trim($form_state['values']['pages']), $form_state['values']['custom'], $form_state['values']['title'], $form_state['values']['module'], $theme->name, 0, 0, $delta, BLOCK_NO_CACHE);
}
}
@@ -333,7 +333,7 @@
*/
function block_box_delete_submit($form, &$form_state) {
db_query('DELETE FROM {boxes} WHERE bid = %d', $form_state['values']['bid']);
- db_query("DELETE FROM {blocks} WHERE module = 'block' AND delta = %d", $form_state['values']['bid']);
+ db_query("DELETE FROM {blocks} WHERE module = 'block' AND delta = '%s'", $form_state['values']['bid']);
drupal_set_message(t('The block %name has been removed.', array('%name' => $form_state['values']['info'])));
cache_clear_all();
$form_state['redirect'] = 'admin/build/block';
Modified: branches/drupal6/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/block/block.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/block/block.info (original)
+++ branches/drupal6/modules/block/block.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/blog/blog.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/blog/blog.info (original)
+++ branches/drupal6/modules/blog/blog.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/blogapi/blogapi.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/blogapi/blogapi.info (original)
+++ branches/drupal6/modules/blogapi/blogapi.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/book/book.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/book/book.admin.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/book/book.admin.inc (original)
+++ branches/drupal6/modules/book/book.admin.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: book.admin.inc,v 1.8.2.2 2008/07/08 10:19:46 goba Exp $
+// $Id: book.admin.inc,v 1.8.2.3 2008/10/22 19:26:01 goba Exp $
/**
* @file
@@ -170,8 +170,8 @@
* @see book_admin_edit()
*/
function _book_admin_table_tree($tree, &$form) {
- foreach ($tree as $key => $data) {
- $form[$key] = array(
+ foreach ($tree as $data) {
+ $form['book-admin-'. $data['link']['nid']] = array(
'#item' => $data['link'],
'nid' => array('#type' => 'value', '#value' => $data['link']['nid']),
'depth' => array('#type' => 'value', '#value' => $data['link']['depth']),
Modified: branches/drupal6/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/book/book.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/book/book.info (original)
+++ branches/drupal6/modules/book/book.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/color/color.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/color/color.info (original)
+++ branches/drupal6/modules/color/color.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/comment/comment.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/comment/comment.info (original)
+++ branches/drupal6/modules/comment/comment.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/contact/contact.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/contact/contact.info (original)
+++ branches/drupal6/modules/contact/contact.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/dblog/dblog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/dblog/dblog.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/dblog/dblog.info (original)
+++ branches/drupal6/modules/dblog/dblog.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/filter/filter.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/filter/filter.info (original)
+++ branches/drupal6/modules/filter/filter.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/forum/forum-topic-list.tpl.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/forum/forum-topic-list.tpl.php?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/forum/forum-topic-list.tpl.php (original)
+++ branches/drupal6/modules/forum/forum-topic-list.tpl.php Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: forum-topic-list.tpl.php,v 1.4 2007/08/30 18:58:12 goba Exp $
+// $Id: forum-topic-list.tpl.php,v 1.4.2.1 2008/10/22 18:22:51 dries Exp $
/**
* @file forum-topic-list.tpl.php
@@ -52,8 +52,8 @@
<a href="<?php print $topic->new_url; ?>"><?php print $topic->new_text; ?></a>
<?php endif; ?>
</td>
- <td class="created"><?php print $topic->created; ?>
- <td class="last-reply"><?php print $topic->last_reply; ?>
+ <td class="created"><?php print $topic->created; ?></td>
+ <td class="last-reply"><?php print $topic->last_reply; ?></td>
<?php endif; ?>
</tr>
<?php endforeach; ?>
Modified: branches/drupal6/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/forum/forum.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/forum/forum.info (original)
+++ branches/drupal6/modules/forum/forum.info Fri Oct 24 21:09:02 2008
@@ -7,8 +7,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/help/help.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/help/help.info (original)
+++ branches/drupal6/modules/help/help.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/locale/locale.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/locale/locale.info (original)
+++ branches/drupal6/modules/locale/locale.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/locale/locale.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/locale/locale.module?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/locale/locale.module (original)
+++ branches/drupal6/modules/locale/locale.module Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: locale.module,v 1.212.2.4 2008/09/08 21:51:50 dries Exp $
+// $Id: locale.module,v 1.212.2.5 2008/10/20 09:31:06 goba Exp $
/**
* @file
@@ -573,11 +573,12 @@
// Only show if we have at least two languages and language dependent
// web addresses, so we can actually link to other language versions.
elseif ($op == 'view' && variable_get('language_count', 1) > 1 && variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE) != LANGUAGE_NEGOTIATION_NONE) {
+ $path = drupal_is_front_page() ? '<front>' : $_GET['q'];
$languages = language_list('enabled');
$links = array();
foreach ($languages[1] as $language) {
$links[$language->language] = array(
- 'href' => $_GET['q'],
+ 'href' => $path,
'title' => $language->native,
'language' => $language,
'attributes' => array('class' => 'language-link'),
@@ -588,7 +589,7 @@
// A translation link may need to point to a different path or use
// a translated link text before going through l(), which will just
// handle the path aliases.
- drupal_alter('translation_link', $links, $_GET['q']);
+ drupal_alter('translation_link', $links, $path);
$block['subject'] = t('Languages');
$block['content'] = theme('links', $links, array());
Modified: branches/drupal6/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/menu/menu.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/menu/menu.info (original)
+++ branches/drupal6/modules/menu/menu.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/node/node.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/node/node.info (original)
+++ branches/drupal6/modules/node/node.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/openid/openid.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/openid/openid.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/openid/openid.info (original)
+++ branches/drupal6/modules/openid/openid.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/path/path.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/path/path.info (original)
+++ branches/drupal6/modules/path/path.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/php/php.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/php/php.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/php/php.info (original)
+++ branches/drupal6/modules/php/php.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/ping/ping.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/ping/ping.info (original)
+++ branches/drupal6/modules/ping/ping.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/poll/poll.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/poll/poll.info (original)
+++ branches/drupal6/modules/poll/poll.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/profile/profile.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/profile/profile.admin.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/profile/profile.admin.inc (original)
+++ branches/drupal6/modules/profile/profile.admin.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: profile.admin.inc,v 1.8 2008/01/21 15:20:43 goba Exp $
+// $Id: profile.admin.inc,v 1.8.2.1 2008/10/16 12:43:08 goba Exp $
/**
* @file
@@ -269,6 +269,7 @@
$form['fields']['autocomplete'] = array('#type' => 'checkbox',
'#title' => t('Form will auto-complete while user is typing.'),
'#default_value' => $edit['autocomplete'],
+ '#description' => t('For security, auto-complete will be disabled if the user does not have access to user profiles.'),
);
$form['fields']['required'] = array('#type' => 'checkbox',
'#title' => t('The user must enter a value.'),
Modified: branches/drupal6/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/profile/profile.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/profile/profile.info (original)
+++ branches/drupal6/modules/profile/profile.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/search/search.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/search/search.info (original)
+++ branches/drupal6/modules/search/search.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/statistics/statistics.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/statistics/statistics.info (original)
+++ branches/drupal6/modules/statistics/statistics.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/syslog/syslog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/syslog/syslog.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/syslog/syslog.info (original)
+++ branches/drupal6/modules/syslog/syslog.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/system/system.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/system/system.admin.inc?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/system/system.admin.inc (original)
+++ branches/drupal6/modules/system/system.admin.inc Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: system.admin.inc,v 1.63.2.3 2008/05/19 07:27:35 goba Exp $
+// $Id: system.admin.inc,v 1.63.2.4 2008/10/16 20:23:37 dries Exp $
/**
* @file
@@ -680,16 +680,16 @@
foreach ($file->info['dependencies'] as $dependency) {
if (!isset($files[$dependency]) || !$files[$dependency]->status) {
if (isset($files[$dependency])) {
- $dependencies[] = $files[$dependency]->info['name'] . t(' (<span class="admin-disabled">disabled</span>)');
+ $dependencies[] = t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $files[$dependency]->info['name']));
}
else {
- $dependencies[] = drupal_ucfirst($dependency) . t(' (<span class="admin-missing">missing</span>)');
+ $dependencies[] = t('@module (<span class="admin-missing">missing</span>)', array('@module' => drupal_ucfirst($dependency)));
$disabled[] = $filename;
$form['disabled_modules']['#value'][$filename] = FALSE;
}
}
else {
- $dependencies[] = $files[$dependency]->info['name'] . t(' (<span class="admin-enabled">enabled</span>)');
+ $dependencies[] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $files[$dependency]->info['name']));
}
}
@@ -707,12 +707,12 @@
$dependents = array();
foreach ($file->info['dependents'] as $dependent) {
if ($files[$dependent]->status == 1) {
- $dependents[] = $files[$dependent]->info['name'] . t(' (<span class="admin-enabled">enabled</span>)');
+ $dependents[] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $files[$dependent]->info['name']));
$disabled[] = $filename;
$form['disabled_modules']['#value'][$filename] = TRUE;
}
else {
- $dependents[] = $files[$dependent]->info['name'] . t(' (<span class="admin-disabled">disabled</span>)');
+ $dependents[] = t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $files[$dependent]->info['name']));
}
}
Modified: branches/drupal6/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/system/system.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/system/system.info (original)
+++ branches/drupal6/modules/system/system.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/system/system.module?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/system/system.module (original)
+++ branches/drupal6/modules/system/system.module Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: system.module,v 1.585.2.20 2008/10/08 20:12:18 goba Exp $
+// $Id: system.module,v 1.585.2.22 2008/10/22 19:26:02 goba Exp $
/**
* @file
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.5');
+define('VERSION', '6.6');
/**
* 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=1948&op=diff
==============================================================================
--- branches/drupal6/modules/taxonomy/taxonomy.info (original)
+++ branches/drupal6/modules/taxonomy/taxonomy.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/throttle/throttle.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/throttle/throttle.info (original)
+++ branches/drupal6/modules/throttle/throttle.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/tracker/tracker.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/tracker/tracker.info (original)
+++ branches/drupal6/modules/tracker/tracker.info Fri Oct 24 21:09:02 2008
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/translation/translation.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/translation/translation.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/translation/translation.info (original)
+++ branches/drupal6/modules/translation/translation.info Fri Oct 24 21:09:02 2008
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/translation/translation.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/translation/translation.module?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/translation/translation.module (original)
+++ branches/drupal6/modules/translation/translation.module Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: translation.module,v 1.23.2.1 2008/08/16 21:37:45 dries Exp $
+// $Id: translation.module,v 1.23.2.2 2008/10/16 11:57:52 goba Exp $
/**
* @file
@@ -244,8 +244,8 @@
*/
function translation_remove_from_set($node) {
if (isset($node->tnid)) {
- if (db_result(db_query('SELECT COUNT(*) FROM {node} WHERE tnid = %d', $node->tnid)) <= 2) {
- // There would only be one node left in the set: remove the set altogether.
+ if (db_result(db_query('SELECT COUNT(*) FROM {node} WHERE tnid = %d', $node->tnid)) == 1) {
+ // There is only one node left in the set: remove the set altogether.
db_query('UPDATE {node} SET tnid = 0, translate = 0 WHERE tnid = %d', $node->tnid);
}
else {
Modified: branches/drupal6/modules/trigger/trigger.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/trigger/trigger.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/trigger/trigger.info (original)
+++ branches/drupal6/modules/trigger/trigger.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/update/update.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/update/update.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/update/update.info (original)
+++ branches/drupal6/modules/update/update.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/upload/upload.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/upload/upload.info (original)
+++ branches/drupal6/modules/upload/upload.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/modules/user/user-profile.tpl.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/user/user-profile.tpl.php?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/user/user-profile.tpl.php (original)
+++ branches/drupal6/modules/user/user-profile.tpl.php Fri Oct 24 21:09:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: user-profile.tpl.php,v 1.2 2007/08/07 08:39:36 goba Exp $
+// $Id: user-profile.tpl.php,v 1.2.2.1 2008/10/15 13:52:04 dries Exp $
/**
* @file user-profile.tpl.php
@@ -13,7 +13,7 @@
* It is keyed to the name of each category or other data attached to the
* account. If it is a category it will contain all the profile items. By
* default $profile['summary'] is provided which contains data on the user's
- * history. Other data can be included by modules. $profile['picture'] is
+ * history. Other data can be included by modules. $profile['user_picture'] is
* available by default showing the account picture.
*
* Also keep in mind that profile items and their categories can be defined by
@@ -26,17 +26,19 @@
*
* To check for all available data within $profile, use the code below.
*
- * <?php print '<pre>'. check_plain(print_r($profile, 1)) .'</pre>'; ?>
+ * @code
+ * print '<pre>'. check_plain(print_r($profile, 1)) .'</pre>';
+ * @endcode
*
* @see user-profile-category.tpl.php
- * where the html is handled for the group.
+ * Where the html is handled for the group.
* @see user-profile-field.tpl.php
- * where the html is handled for each item in the group.
+ * Where the html is handled for each item in the group.
*
* Available variables:
- * - $user_profile: All user profile data. Ready for print.
- * - $profile: Keyed array of profile categories and their items or other data
- * provided by modules.
+ * - $user_profile: All user profile data. Ready for print.
+ * - $profile: Keyed array of profile categories and their items or other data
+ * provided by modules.
*
* @see template_preprocess_user_profile()
*/
Modified: branches/drupal6/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/user/user.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/modules/user/user.info (original)
+++ branches/drupal6/modules/user/user.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/themes/bluemarine/bluemarine.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/bluemarine/bluemarine.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/themes/bluemarine/bluemarine.info (original)
+++ branches/drupal6/themes/bluemarine/bluemarine.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/themes/chameleon/chameleon.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/chameleon/chameleon.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/themes/chameleon/chameleon.info (original)
+++ branches/drupal6/themes/chameleon/chameleon.info Fri Oct 24 21:09:02 2008
@@ -12,8 +12,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/themes/chameleon/marvin/marvin.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/chameleon/marvin/marvin.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/themes/chameleon/marvin/marvin.info (original)
+++ branches/drupal6/themes/chameleon/marvin/marvin.info Fri Oct 24 21:09:02 2008
@@ -7,8 +7,8 @@
core = 6.x
base theme = chameleon
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/themes/garland/garland.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/garland/garland.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/themes/garland/garland.info (original)
+++ branches/drupal6/themes/garland/garland.info Fri Oct 24 21:09:02 2008
@@ -7,8 +7,8 @@
stylesheets[all][] = style.css
stylesheets[print][] = print.css
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/themes/garland/minnelli/minnelli.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/garland/minnelli/minnelli.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/themes/garland/minnelli/minnelli.info (original)
+++ branches/drupal6/themes/garland/minnelli/minnelli.info Fri Oct 24 21:09:02 2008
@@ -6,8 +6,8 @@
base theme = garland
stylesheets[all][] = minnelli.css
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
Modified: branches/drupal6/themes/pushbutton/pushbutton.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/pushbutton/pushbutton.info?rev=1948&op=diff
==============================================================================
--- branches/drupal6/themes/pushbutton/pushbutton.info (original)
+++ branches/drupal6/themes/pushbutton/pushbutton.info Fri Oct 24 21:09:02 2008
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2008-10-08
-version = "6.5"
+; Information added by drupal.org packaging script on 2008-10-22
+version = "6.6"
project = "drupal"
-datestamp = "1223497210"
+datestamp = "1224703816"
More information about the Pkg-drupal-commits
mailing list