[Pkg-drupal-commits] r2011 - in /branches/upstream/current-6: ./ 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
Sun Mar 1 17:25:23 UTC 2009
Author: luigi
Date: Sun Mar 1 17:25:23 2009
New Revision: 2011
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2011
Log:
[svn-upgrade] Integrating new upstream version, drupal6 (6.10)
Modified:
branches/upstream/current-6/CHANGELOG.txt
branches/upstream/current-6/includes/actions.inc
branches/upstream/current-6/includes/bootstrap.inc
branches/upstream/current-6/includes/common.inc
branches/upstream/current-6/includes/database.inc
branches/upstream/current-6/includes/form.inc
branches/upstream/current-6/includes/install.inc
branches/upstream/current-6/includes/menu.inc
branches/upstream/current-6/includes/module.inc
branches/upstream/current-6/includes/theme.inc
branches/upstream/current-6/install.php
branches/upstream/current-6/modules/aggregator/aggregator.info
branches/upstream/current-6/modules/block/block.info
branches/upstream/current-6/modules/blog/blog.info
branches/upstream/current-6/modules/blog/blog.module
branches/upstream/current-6/modules/blogapi/blogapi.info
branches/upstream/current-6/modules/book/book.info
branches/upstream/current-6/modules/book/book.module
branches/upstream/current-6/modules/color/color.info
branches/upstream/current-6/modules/color/color.module
branches/upstream/current-6/modules/comment/comment.info
branches/upstream/current-6/modules/contact/contact.info
branches/upstream/current-6/modules/dblog/dblog.info
branches/upstream/current-6/modules/filter/filter.info
branches/upstream/current-6/modules/forum/forum.info
branches/upstream/current-6/modules/help/help.info
branches/upstream/current-6/modules/locale/locale.info
branches/upstream/current-6/modules/locale/locale.module
branches/upstream/current-6/modules/menu/menu.admin.inc
branches/upstream/current-6/modules/menu/menu.info
branches/upstream/current-6/modules/menu/menu.module
branches/upstream/current-6/modules/node/node.info
branches/upstream/current-6/modules/node/node.module
branches/upstream/current-6/modules/openid/openid.info
branches/upstream/current-6/modules/path/path.info
branches/upstream/current-6/modules/php/php.info
branches/upstream/current-6/modules/ping/ping.info
branches/upstream/current-6/modules/poll/poll.info
branches/upstream/current-6/modules/profile/profile.info
branches/upstream/current-6/modules/search/search.info
branches/upstream/current-6/modules/search/search.module
branches/upstream/current-6/modules/statistics/statistics.info
branches/upstream/current-6/modules/syslog/syslog.info
branches/upstream/current-6/modules/system/system.admin.inc
branches/upstream/current-6/modules/system/system.info
branches/upstream/current-6/modules/system/system.install
branches/upstream/current-6/modules/system/system.module
branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc
branches/upstream/current-6/modules/taxonomy/taxonomy.info
branches/upstream/current-6/modules/taxonomy/taxonomy.module
branches/upstream/current-6/modules/throttle/throttle.info
branches/upstream/current-6/modules/tracker/tracker.info
branches/upstream/current-6/modules/translation/translation.info
branches/upstream/current-6/modules/trigger/trigger.info
branches/upstream/current-6/modules/update/update.info
branches/upstream/current-6/modules/upload/upload.info
branches/upstream/current-6/modules/user/user.info
branches/upstream/current-6/modules/user/user.module
branches/upstream/current-6/themes/bluemarine/bluemarine.info
branches/upstream/current-6/themes/chameleon/chameleon.info
branches/upstream/current-6/themes/chameleon/marvin/marvin.info
branches/upstream/current-6/themes/garland/garland.info
branches/upstream/current-6/themes/garland/minnelli/minnelli.info
branches/upstream/current-6/themes/garland/template.php
branches/upstream/current-6/themes/pushbutton/pushbutton.info
Modified: branches/upstream/current-6/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/CHANGELOG.txt?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/CHANGELOG.txt (original)
+++ branches/upstream/current-6/CHANGELOG.txt Sun Mar 1 17:25:23 2009
@@ -1,4 +1,12 @@
-// $Id: CHANGELOG.txt,v 1.253.2.22 2009/01/14 23:34:06 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.25 2009/02/25 21:02:36 goba Exp $
+
+Drupal 6.10, 2009-02-25
+----------------------
+- Fixed a security issue, (Local file inclusion on Windows),
+ see SA-CORE-2009-003
+- Fixed node_feed() so custom fields can show up in RSS feeds.
+- Improved PostgreSQL compatibility.
+- Fixed a variety of small bugs.
Drupal 6.9, 2009-01-14
----------------------
@@ -10,9 +18,6 @@
- Removed t() calls from all schema documentation. Suggested best practice
changed for contributed modules, see http://drupal.org/node/322731.
- Fixed a variety of small bugs.
-
-Drupal 6.9-dev, xxxx-xx-xx (development release)
-----------------------
Drupal 6.8, 2008-12-11
----------------------
Modified: branches/upstream/current-6/includes/actions.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/actions.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/actions.inc (original)
+++ branches/upstream/current-6/includes/actions.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: actions.inc,v 1.8.2.6 2009/01/06 17:02:58 goba Exp $
+// $Id: actions.inc,v 1.8.2.7 2009/02/16 14:34:30 goba Exp $
/**
* @file
@@ -40,6 +40,7 @@
* performs the action, keyed on action ID.
*/
function actions_do($action_ids, &$object, $context = NULL, $a1 = NULL, $a2 = NULL) {
+ // $stack tracks the number of recursive calls.
static $stack;
$stack++;
if ($stack > variable_get('actions_max_stack', 35)) {
@@ -103,6 +104,7 @@
$result[$action_ids] = $action_ids($object, $context, $a1, $a2);
}
}
+ $stack--;
return $result;
}
Modified: branches/upstream/current-6/includes/bootstrap.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/bootstrap.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/bootstrap.inc (original)
+++ branches/upstream/current-6/includes/bootstrap.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: bootstrap.inc,v 1.206.2.9 2009/01/14 19:10:25 goba Exp $
+// $Id: bootstrap.inc,v 1.206.2.11 2009/02/25 13:49:54 dries Exp $
/**
* @file
@@ -130,6 +130,16 @@
* if no language identified by domain.
*/
define('LANGUAGE_NEGOTIATION_DOMAIN', 3);
+
+/**
+ * Language written left to right. Possible value of $language->direction.
+ */
+define('LANGUAGE_LTR', 0);
+
+/**
+ * Language written right to left. Possible value of $language->direction.
+ */
+define('LANGUAGE_RTL', 1);
/**
* Start the timer with the specified name. If you start and stop
@@ -551,7 +561,7 @@
}
$cache = NULL;
- if (!$user->uid && $_SERVER['REQUEST_METHOD'] == 'GET' && count(drupal_set_message()) == 0) {
+ if (!$user->uid && $_SERVER['REQUEST_METHOD'] == 'GET' && count(drupal_set_message()) == 0 && $_SERVER['SERVER_SOFTWARE'] !== 'PHP CLI') {
$cache = cache_get($base_root . request_uri(), 'cache_page');
if (empty($cache)) {
Modified: branches/upstream/current-6/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/common.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/common.inc (original)
+++ branches/upstream/current-6/includes/common.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.756.2.42 2009/01/14 23:34:07 goba Exp $
+// $Id: common.inc,v 1.756.2.47 2009/02/25 21:02:36 goba Exp $
/**
* @file
@@ -1411,7 +1411,6 @@
global $base_url;
static $script;
- static $clean_url;
if (!isset($script)) {
// On some web servers, such as IIS, we can't omit "index.php". So, we
@@ -1420,11 +1419,6 @@
$script = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') === FALSE) ? 'index.php' : '';
}
- // Cache the clean_url variable to improve performance.
- if (!isset($clean_url)) {
- $clean_url = (bool)variable_get('clean_url', '0');
- }
-
if (!isset($options['base_url'])) {
// The base_url might be rewritten from the language rewrite in domain mode.
$options['base_url'] = $base_url;
@@ -1450,7 +1444,7 @@
$prefix = empty($path) ? rtrim($options['prefix'], '/') : $options['prefix'];
$path = drupal_urlencode($prefix . $path);
- if ($clean_url) {
+ if (variable_get('clean_url', '0')) {
// With Clean URLs.
if ($options['query']) {
return $base . $path .'?'. $options['query'] . $options['fragment'];
@@ -1539,6 +1533,8 @@
* an HTML string containing a link to the given path.
*/
function l($text, $path, $options = array()) {
+ global $language;
+
// Merge in defaults.
$options += array(
'attributes' => array(),
@@ -1546,7 +1542,8 @@
);
// Append active class.
- if ($path == $_GET['q'] || ($path == '<front>' && drupal_is_front_page())) {
+ if (($path == $_GET['q'] || ($path == '<front>' && drupal_is_front_page())) &&
+ (empty($options['language']) || $options['language']->language == $language->language)) {
if (isset($options['attributes']['class'])) {
$options['attributes']['class'] .= ' active';
}
@@ -1757,7 +1754,7 @@
$css[$media][$type][$path] = $preprocess;
// If the current language is RTL, add the CSS file with RTL overrides.
- if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) {
+ if ($language->direction == LANGUAGE_RTL) {
$rtl_path = str_replace('.css', '-rtl.css', $path);
if (file_exists($rtl_path)) {
$css[$media][$type][$rtl_path] = $preprocess;
Modified: branches/upstream/current-6/includes/database.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/database.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.inc (original)
+++ branches/upstream/current-6/includes/database.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: database.inc,v 1.92.2.3 2008/10/20 09:13:04 goba Exp $
+// $Id: database.inc,v 1.92.2.4 2009/02/16 14:41:58 goba Exp $
/**
* @file
@@ -458,7 +458,7 @@
*
* - 'primary key': An array of one or more key column specifiers (see below)
* that form the primary key.
- * - 'unique key': An associative array of unique keys ('keyname' =>
+ * - 'unique keys': An associative array of unique keys ('keyname' =>
* specification). Each specification is an array of one or more
* key column specifiers (see below) that form a unique key on the table.
* - 'indexes': An associative array of indexes ('indexame' =>
Modified: branches/upstream/current-6/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/form.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/form.inc (original)
+++ branches/upstream/current-6/includes/form.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.265.2.17 2009/01/12 16:07:23 goba Exp $
+// $Id: form.inc,v 1.265.2.19 2009/02/22 18:12:46 goba Exp $
/**
* @defgroup forms Form builder functions
@@ -1169,7 +1169,12 @@
*/
function form_type_checkbox_value($form, $edit = FALSE) {
if ($edit !== FALSE) {
- return !empty($edit) ? $form['#return_value'] : 0;
+ if (empty($form['#disabled'])) {
+ return !empty($edit) ? $form['#return_value'] : 0;
+ }
+ else {
+ return $form['#default_value'];
+ }
}
}
@@ -1533,7 +1538,7 @@
$output .= (check_plain($element['#value']) == $element['#return_value']) ? ' checked="checked" ' : ' ';
$output .= drupal_attributes($element['#attributes']) .' />';
if (!is_null($element['#title'])) {
- $output = '<label class="option">'. $output .' '. $element['#title'] .'</label>';
+ $output = '<label class="option" for="'. $element['#id'] .'">'. $output .' '. $element['#title'] .'</label>';
}
unset($element['#title']);
@@ -1872,7 +1877,7 @@
$checkbox .= drupal_attributes($element['#attributes']) .' />';
if (!is_null($element['#title'])) {
- $checkbox = '<label class="option">'. $checkbox .' '. $element['#title'] .'</label>';
+ $checkbox = '<label class="option" for="'. $element['#id'] .'">'. $checkbox .' '. $element['#title'] .'</label>';
}
unset($element['#title']);
Modified: branches/upstream/current-6/includes/install.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/install.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/install.inc (original)
+++ branches/upstream/current-6/includes/install.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: install.inc,v 1.56.2.3 2008/08/14 09:26:43 dries Exp $
+// $Id: install.inc,v 1.56.2.4 2009/02/16 10:25:02 goba Exp $
define('SCHEMA_UNINSTALLED', -1);
define('SCHEMA_INSTALLED', 0);
@@ -281,7 +281,7 @@
// Get a list of modules required by this profile.
$function = $profile .'_profile_modules';
- $module_list = array_merge(drupal_required_modules(), $function(), ($locale != 'en' ? array('locale') : array()));
+ $module_list = array_merge(drupal_required_modules(), $function(), ($locale != 'en' && !empty($locale) ? array('locale') : array()));
// Get a list of modules that exist in Drupal's assorted subdirectories.
$present_modules = array();
Modified: branches/upstream/current-6/includes/menu.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/menu.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/menu.inc (original)
+++ branches/upstream/current-6/includes/menu.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.inc,v 1.255.2.27 2008/11/10 17:30:39 goba Exp $
+// $Id: menu.inc,v 1.255.2.28 2009/02/09 16:28:21 dries Exp $
/**
* @file
@@ -552,14 +552,17 @@
* a non existing node) then this function return FALSE.
*/
function _menu_translate(&$router_item, $map, $to_arg = FALSE) {
+ if ($to_arg) {
+ // Fill in missing path elements, such as the current uid.
+ _menu_link_map_translate($map, $router_item['to_arg_functions']);
+ }
+ // The $path_map saves the pieces of the path as strings, while elements in
+ // $map may be replaced with loaded objects.
$path_map = $map;
if (!_menu_load_objects($router_item, $map)) {
// An error occurred loading an object.
$router_item['access'] = FALSE;
return FALSE;
- }
- if ($to_arg) {
- _menu_link_map_translate($path_map, $router_item['to_arg_functions']);
}
// Generate the link path for the page request or local tasks.
Modified: branches/upstream/current-6/includes/module.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/module.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/module.inc (original)
+++ branches/upstream/current-6/includes/module.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: module.inc,v 1.115 2007/12/27 12:31:05 goba Exp $
+// $Id: module.inc,v 1.115.2.1 2009/02/16 10:32:10 goba Exp $
/**
* @file
@@ -48,8 +48,8 @@
static $list, $sorted_list;
if ($refresh || $fixed_list) {
- unset($sorted_list);
$list = array();
+ $sorted_list = NULL;
if ($fixed_list) {
foreach ($fixed_list as $name => $module) {
drupal_get_filename('module', $name, $module['filename']);
Modified: branches/upstream/current-6/includes/theme.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/theme.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/includes/theme.inc (original)
+++ branches/upstream/current-6/includes/theme.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: theme.inc,v 1.415.2.17 2008/12/10 21:09:05 goba Exp $
+// $Id: theme.inc,v 1.415.2.19 2009/02/25 21:02:16 goba Exp $
/**
* @file
@@ -1133,6 +1133,7 @@
* A string containing an unordered list of links.
*/
function theme_links($links, $attributes = array('class' => 'links')) {
+ global $language;
$output = '';
if (count($links) > 0) {
@@ -1151,7 +1152,8 @@
if ($i == $num_links) {
$class .= ' last';
}
- if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))) {
+ if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))
+ && (empty($link['language']) || $link['language']->language == $language->language)) {
$class .= ' active';
}
$output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
@@ -1866,6 +1868,7 @@
$suggestion = 'page';
$suggestions = array();
while ($arg = arg($i++)) {
+ $arg = str_replace(array('/', '\\', '\0'), '', $arg);
$suggestions[] = $suggestion .'-'. $arg;
if (!is_numeric($arg)) {
$suggestion .= '-'. $arg;
Modified: branches/upstream/current-6/install.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/install.php?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/install.php (original)
+++ branches/upstream/current-6/install.php Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: install.php,v 1.113.2.7 2008/10/22 16:31:37 goba Exp $
+// $Id: install.php,v 1.113.2.8 2009/02/25 11:47:36 goba Exp $
require_once './includes/install.inc';
@@ -556,9 +556,11 @@
}
}
- foreach ($locales as $locale) {
- if ($_POST['locale'] == $locale->name) {
- return $locale->name;
+ if (!empty($_POST['locale'])) {
+ foreach ($locales as $locale) {
+ if ($_POST['locale'] == $locale->name) {
+ return $locale->name;
+ }
}
}
Modified: branches/upstream/current-6/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/aggregator/aggregator.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-6/modules/aggregator/aggregator.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/block/block.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/block/block.info (original)
+++ branches/upstream/current-6/modules/block/block.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blog/blog.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blog/blog.info (original)
+++ branches/upstream/current-6/modules/blog/blog.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/blog/blog.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blog/blog.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blog/blog.module (original)
+++ branches/upstream/current-6/modules/blog/blog.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: blog.module,v 1.297.2.3 2008/05/19 07:27:35 goba Exp $
+// $Id: blog.module,v 1.297.2.4 2009/02/25 12:21:53 goba Exp $
/**
* @file
@@ -49,7 +49,8 @@
$user->content['summary']['blog'] = array(
'#type' => 'user_profile_item',
'#title' => t('Blog'),
- '#value' => l(t('View recent blog entries'), "blog/$user->uid", array('attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $user->name))))),
+ // l() escapes the attributes, so we should not escape !username here.
+ '#value' => l(t('View recent blog entries'), "blog/$user->uid", array('attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => $user->name))))),
'#attributes' => array('class' => 'blog'),
);
}
@@ -104,8 +105,8 @@
*/
function blog_view($node, $teaser = FALSE, $page = FALSE) {
if ($page) {
- // Breadcrumb navigation
- drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("@name's blog", array('@name' => $node->name)), 'blog/'. $node->uid)));
+ // Breadcrumb navigation. l() escapes the title, so we should not escape !name.
+ drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("!name's blog", array('!name' => $node->name)), 'blog/'. $node->uid)));
}
return node_prepare($node, $teaser);
}
@@ -118,10 +119,11 @@
if ($type == 'node' && $node->type == 'blog') {
if (arg(0) != 'blog' || arg(1) != $node->uid) {
+ // This goes to l() and therefore escapes !username in both the title and attributes.
$links['blog_usernames_blog'] = array(
- 'title' => t("@username's blog", array('@username' => $node->name)),
+ 'title' => t("!username's blog", array('!username' => $node->name)),
'href' => "blog/$node->uid",
- 'attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $node->name)))
+ 'attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => $node->name)))
);
}
}
Modified: branches/upstream/current-6/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blogapi/blogapi.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-6/modules/blogapi/blogapi.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/book/book.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/book/book.info (original)
+++ branches/upstream/current-6/modules/book/book.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/book/book.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/book/book.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/book/book.module (original)
+++ branches/upstream/current-6/modules/book/book.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: book.module,v 1.454.2.5 2008/07/03 06:38:46 dries Exp $
+// $Id: book.module,v 1.454.2.6 2009/02/25 11:47:37 goba Exp $
/**
* @file
@@ -885,7 +885,7 @@
$variables['title'] = check_plain($variables['title']);
$variables['base_url'] = $base_url;
$variables['language'] = $language;
- $variables['language_rtl'] = (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) ? TRUE : FALSE;
+ $variables['language_rtl'] = ($language->direction == LANGUAGE_RTL);
$variables['head'] = drupal_get_html_head();
}
Modified: branches/upstream/current-6/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/color/color.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/color/color.info (original)
+++ branches/upstream/current-6/modules/color/color.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/color/color.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/color/color.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/color/color.module (original)
+++ branches/upstream/current-6/modules/color/color.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: color.module,v 1.39 2008/01/23 09:43:25 goba Exp $
+// $Id: color.module,v 1.39.2.1 2009/02/25 11:47:37 goba Exp $
/**
* Implementation of hook_help().
@@ -93,7 +93,7 @@
// If the current language is RTL and the CSS file had an RTL variant,
// pull out the non-colored and add rewritten RTL stylesheet.
- if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) {
+ if ($language->direction == LANGUAGE_RTL) {
$rtl_old_path = str_replace('.css', '-rtl.css', $old_path);
$rtl_color_path = str_replace('.css', '-rtl.css', $color_path);
if (file_exists($rtl_color_path)) {
Modified: branches/upstream/current-6/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/comment/comment.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.info (original)
+++ branches/upstream/current-6/modules/comment/comment.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/contact/contact.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/contact/contact.info (original)
+++ branches/upstream/current-6/modules/contact/contact.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/dblog/dblog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/dblog/dblog.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/dblog/dblog.info (original)
+++ branches/upstream/current-6/modules/dblog/dblog.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/filter/filter.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/filter/filter.info (original)
+++ branches/upstream/current-6/modules/filter/filter.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/forum/forum.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.info (original)
+++ branches/upstream/current-6/modules/forum/forum.info Sun Mar 1 17:25:23 2009
@@ -7,8 +7,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/help/help.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/help/help.info (original)
+++ branches/upstream/current-6/modules/help/help.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/locale/locale.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/locale/locale.info (original)
+++ branches/upstream/current-6/modules/locale/locale.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/locale/locale.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/locale/locale.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/locale/locale.module (original)
+++ branches/upstream/current-6/modules/locale/locale.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: locale.module,v 1.212.2.5 2008/10/20 09:31:06 goba Exp $
+// $Id: locale.module,v 1.212.2.6 2009/02/25 11:47:37 goba Exp $
/**
* @file
@@ -11,17 +11,6 @@
* assigned. The setup of languages and translations is completely web based.
* Gettext portable object files are supported.
*/
-
-/**
- * Language written left to right. Possible value of $language->direction.
- */
-define('LANGUAGE_LTR', 0);
-
-/**
- * Language written right to left. Possible value of $language->direction.
- */
-define('LANGUAGE_RTL', 1);
-
// ---------------------------------------------------------------------------------
// Hook implementations
Modified: branches/upstream/current-6/modules/menu/menu.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/menu/menu.admin.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/menu/menu.admin.inc (original)
+++ branches/upstream/current-6/modules/menu/menu.admin.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.admin.inc,v 1.26.2.3 2008/02/11 15:12:53 goba Exp $
+// $Id: menu.admin.inc,v 1.26.2.4 2009/02/25 13:15:40 goba Exp $
/**
* @file
@@ -366,7 +366,7 @@
* Process menu and menu item add/edit form submissions.
*/
function menu_edit_item_submit($form, &$form_state) {
- $item = $form_state['values']['menu'];
+ $item = &$form_state['values']['menu'];
// The value of "hidden" is the opposite of the value
// supplied by the "enabled" checkbox.
Modified: branches/upstream/current-6/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/menu/menu.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/menu/menu.info (original)
+++ branches/upstream/current-6/modules/menu/menu.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/menu/menu.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/menu/menu.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/menu/menu.module (original)
+++ branches/upstream/current-6/modules/menu/menu.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.module,v 1.157.2.3 2008/05/10 06:53:53 dries Exp $
+// $Id: menu.module,v 1.157.2.5 2009/02/25 13:15:40 goba Exp $
/**
* @file
@@ -163,11 +163,13 @@
*/
function menu_enable() {
menu_rebuild();
- $link = db_fetch_array(db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'"));
- $link['router_path'] = 'admin/build/menu-customize/%';
- $link['module'] = 'menu';
+ $base_link = db_fetch_array(db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'"));
+ $base_link['router_path'] = 'admin/build/menu-customize/%';
+ $base_link['module'] = 'menu';
$result = db_query("SELECT * FROM {menu_custom}");
while ($menu = db_fetch_array($result)) {
+ // $link is passed by reference to menu_link_save(), so we make a copy of $base_link.
+ $link = $base_link;
$link['mlid'] = 0;
$link['link_title'] = $menu['title'];
$link['link_path'] = 'admin/build/menu-customize/'. $menu['menu_name'];
@@ -296,7 +298,7 @@
case 'insert':
case 'update':
if (isset($node->menu)) {
- $item = $node->menu;
+ $item = &$node->menu;
if (!empty($item['delete'])) {
menu_link_delete($item['mlid']);
}
Modified: branches/upstream/current-6/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/node/node.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.info (original)
+++ branches/upstream/current-6/modules/node/node.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/node/node.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/node/node.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.module (original)
+++ branches/upstream/current-6/modules/node/node.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: node.module,v 1.947.2.13 2009/01/14 23:34:07 goba Exp $
+// $Id: node.module,v 1.947.2.15 2009/02/16 14:39:40 goba Exp $
/**
* @file
@@ -832,6 +832,7 @@
}
else {
$node->teaser = '';
+ $node->format = 0;
}
}
@@ -1675,8 +1676,23 @@
$item = node_prepare($item, $teaser);
}
- // Allow modules to change $node->teaser before viewing.
+ // Allow modules to change $node->content before the node is rendered.
node_invoke_nodeapi($item, 'view', $teaser, FALSE);
+
+ // Set the proper node property, then unset unused $node property so that a
+ // bad theme can not open a security hole.
+ $content = drupal_render($item->content);
+ if ($teaser) {
+ $item->teaser = $content;
+ unset($item->body);
+ }
+ else {
+ $item->body = $content;
+ unset($item->teaser);
+ }
+
+ // Allow modules to modify the fully-built node.
+ node_invoke_nodeapi($item, 'alter', $teaser, FALSE);
}
// Allow modules to add additional item fields and/or modify $item
Modified: branches/upstream/current-6/modules/openid/openid.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/openid/openid.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/openid/openid.info (original)
+++ branches/upstream/current-6/modules/openid/openid.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/path/path.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/path/path.info (original)
+++ branches/upstream/current-6/modules/path/path.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/php/php.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/php/php.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/php/php.info (original)
+++ branches/upstream/current-6/modules/php/php.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/ping/ping.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/ping/ping.info (original)
+++ branches/upstream/current-6/modules/ping/ping.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/poll/poll.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/poll/poll.info (original)
+++ branches/upstream/current-6/modules/poll/poll.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/profile/profile.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/profile/profile.info (original)
+++ branches/upstream/current-6/modules/profile/profile.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/search/search.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.info (original)
+++ branches/upstream/current-6/modules/search/search.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/search/search.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/search/search.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.module (original)
+++ branches/upstream/current-6/modules/search/search.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: search.module,v 1.250.2.4 2008/09/17 06:42:20 goba Exp $
+// $Id: search.module,v 1.250.2.5 2009/02/25 16:17:40 goba Exp $
/**
* @file
@@ -637,7 +637,9 @@
while ($link = db_fetch_object($result)) {
$output[] = $link->caption;
}
- return '<a>('. implode(', ', $output) .')</a>';
+ if (count($output)) {
+ return '<a>('. implode(', ', $output) .')</a>';
+ }
// Reindex the node when it is updated. The node is automatically indexed
// when it is added, simply by being added to the node table.
case 'update':
Modified: branches/upstream/current-6/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/statistics/statistics.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/statistics/statistics.info (original)
+++ branches/upstream/current-6/modules/statistics/statistics.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/syslog/syslog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/syslog/syslog.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/syslog/syslog.info (original)
+++ branches/upstream/current-6/modules/syslog/syslog.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/system/system.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.admin.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.admin.inc (original)
+++ branches/upstream/current-6/modules/system/system.admin.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: system.admin.inc,v 1.63.2.6 2009/01/06 13:33:24 dries Exp $
+// $Id: system.admin.inc,v 1.63.2.7 2009/02/25 11:38:41 goba Exp $
/**
* @file
@@ -1726,7 +1726,7 @@
* Menu callback: return information about PHP.
*/
function system_php() {
- phpinfo(INFO_GENERAL | INFO_CONFIGURATION);
+ phpinfo();
exit();
}
Modified: branches/upstream/current-6/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.info (original)
+++ branches/upstream/current-6/modules/system/system.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/system/system.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.install?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.install (original)
+++ branches/upstream/current-6/modules/system/system.install Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: system.install,v 1.238.2.8 2009/01/14 21:36:16 goba Exp $
+// $Id: system.install,v 1.238.2.12 2009/02/25 14:02:46 goba Exp $
/**
* Test and report Drupal installation requirements.
@@ -64,10 +64,10 @@
$memory_limit = ini_get('memory_limit');
$requirements['php_memory_limit'] = array(
'title' => $t('PHP memory limit'),
- 'value' => $memory_limit,
+ 'value' => $memory_limit == -1 ? t('-1 (Unlimited)') : $memory_limit,
);
- if ($memory_limit && parse_size($memory_limit) < parse_size(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)) {
+ if ($memory_limit && $memory_limit != -1 && parse_size($memory_limit) < parse_size(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)) {
$description = '';
if ($phase == 'install') {
$description = $t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the installation process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT));
@@ -1095,7 +1095,7 @@
),
'unique keys' => array('dst_language' => array('dst', 'language')),
'primary key' => array('pid'),
- 'indexes' => array('src' => array('src')),
+ 'indexes' => array('src_language' => array('src', 'language')),
);
return $schema;
@@ -1161,7 +1161,7 @@
db_add_primary_key($ret, 'term_node', array('vid', 'tid', 'nid'));
db_add_index($ret, 'term_node', 'vid', array('vid'));
- db_query('UPDATE {term_node} t SET vid = (SELECT vid FROM {node} n WHERE t.nid = n.nid)');
+ db_query('UPDATE {term_node} SET vid = (SELECT vid FROM {node} n WHERE {term_node}.nid = n.nid)');
return $ret;
}
@@ -1802,6 +1802,10 @@
$item['router_path'] = $item['path'];
$item['updated'] = FALSE;
}
+ if ($item['description']) {
+ $item['options']['attributes']['title'] = $item['description'];
+ }
+
// Save the link.
menu_link_save($item);
$_SESSION['menu_item_map'][$item['mid']] = array('mlid' => $item['mlid'], 'menu_name' => $item['menu_name']);
@@ -2534,6 +2538,16 @@
/**
+ * Replace src index on the {url_alias} table with src, language.
+ */
+function system_update_6049() {
+ $ret = array();
+ db_drop_index($ret, 'url_alias', 'src');
+ db_add_index($ret, 'url_alias', 'src_language', array('src', 'language'));
+ return $ret;
+}
+
+/**
* @} End of "defgroup updates-5.x-to-6.x"
* The next series of updates should start at 7000.
*/
Modified: branches/upstream/current-6/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.module (original)
+++ branches/upstream/current-6/modules/system/system.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: system.module,v 1.585.2.30 2009/01/14 23:34:07 goba Exp $
+// $Id: system.module,v 1.585.2.32 2009/02/25 21:02:37 goba Exp $
/**
* @file
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.9');
+define('VERSION', '6.10');
/**
* Core API compatibility.
Modified: branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.admin.inc,v 1.22.2.2 2008/10/08 14:23:59 goba Exp $
+// $Id: taxonomy.admin.inc,v 1.22.2.3 2009/02/25 12:53:24 goba Exp $
/**
* @file
@@ -279,7 +279,7 @@
// We are not calling taxonomy_get_tree because that might fail with a big
// number of tags in the freetagging vocabulary.
$results = pager_query(db_rewrite_sql('SELECT t.*, h.parent FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE t.vid = %d ORDER BY weight, name', 't', 'tid'), $page_increment, 0, NULL, $vocabulary->vid);
- $total_entries = db_query(db_rewrite_sql('SELECT count(*) FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE t.vid = %d'), $page_increment, 0, NULL, $vocabulary->vid);
+ $total_entries = db_query(db_rewrite_sql('SELECT count(*) FROM {term_data} t INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE t.vid = %d', 't', 'tid'), $page_increment, 0, NULL, $vocabulary->vid);
while ($term = db_fetch_object($results)) {
$key = 'tid:'. $term->tid .':0';
$current_page[$key] = $term;
Modified: branches/upstream/current-6/modules/taxonomy/taxonomy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/taxonomy/taxonomy.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/taxonomy/taxonomy.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/taxonomy/taxonomy.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.module (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.module,v 1.414.2.5 2008/09/17 12:55:37 goba Exp $
+// $Id: taxonomy.module,v 1.414.2.6 2009/02/16 10:44:09 goba Exp $
/**
* @file
@@ -527,7 +527,7 @@
'#default_value' => $typed_string,
'#autocomplete_path' => 'taxonomy/autocomplete/'. $vocabulary->vid,
'#weight' => $vocabulary->weight,
- '#maxlength' => 255,
+ '#maxlength' => 1024,
);
}
else {
Modified: branches/upstream/current-6/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/throttle/throttle.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/throttle/throttle.info (original)
+++ branches/upstream/current-6/modules/throttle/throttle.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/tracker/tracker.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/tracker/tracker.info (original)
+++ branches/upstream/current-6/modules/tracker/tracker.info Sun Mar 1 17:25:23 2009
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/translation/translation.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/translation/translation.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/translation/translation.info (original)
+++ branches/upstream/current-6/modules/translation/translation.info Sun Mar 1 17:25:23 2009
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/trigger/trigger.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/trigger/trigger.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/trigger/trigger.info (original)
+++ branches/upstream/current-6/modules/trigger/trigger.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/update/update.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.info (original)
+++ branches/upstream/current-6/modules/update/update.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/upload/upload.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/upload/upload.info (original)
+++ branches/upstream/current-6/modules/upload/upload.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.info (original)
+++ branches/upstream/current-6/modules/user/user.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/modules/user/user.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.module?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.module (original)
+++ branches/upstream/current-6/modules/user/user.module Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.892.2.11 2009/01/14 23:34:08 goba Exp $
+// $Id: user.module,v 1.892.2.12 2009/02/25 13:57:04 goba Exp $
/**
* @file
@@ -626,15 +626,15 @@
}
if ($type == 'form' && $category == 'account') {
$form_state = array();
- return user_edit_form($form_state, arg(1), $edit);
+ return user_edit_form($form_state, (isset($account->uid) ? $account->uid : FALSE), $edit);
}
if ($type == 'validate' && $category == 'account') {
- return _user_edit_validate(arg(1), $edit);
+ return _user_edit_validate((isset($account->uid) ? $account->uid : FALSE), $edit);
}
if ($type == 'submit' && $category == 'account') {
- return _user_edit_submit(arg(1), $edit);
+ return _user_edit_submit((isset($account->uid) ? $account->uid : FALSE), $edit);
}
if ($type == 'categories') {
@@ -1441,7 +1441,8 @@
'#title' => t('Account information'),
'#weight' => -10,
);
- if (user_access('change own username') || $admin || $register) {
+ // Only show name field when: registration page; or user is editing own account and can change username; or an admin user.
+ if ($register || ($GLOBALS['user']->uid == $uid && user_access('change own username')) || $admin) {
$form['account']['name'] = array('#type' => 'textfield',
'#title' => t('Username'),
'#default_value' => $edit['name'],
@@ -1543,9 +1544,8 @@
}
function _user_edit_validate($uid, &$edit) {
- $user = user_load(array('uid' => $uid));
- // Validate the username:
- if (user_access('change own username') || user_access('administer users') || !$user->uid) {
+ // Validate the username when: new user account; or user is editing own account and can change username; or an admin user.
+ if (!$uid || ($GLOBALS['user']->uid == $uid && user_access('change own username')) || user_access('administer users')) {
if ($error = user_validate_name($edit['name'])) {
form_set_error('name', $error);
}
@@ -1570,11 +1570,11 @@
}
function _user_edit_submit($uid, &$edit) {
- $user = user_load(array('uid' => $uid));
+ $account = user_load($uid);
// Delete picture if requested, and if no replacement picture was given.
if (!empty($edit['picture_delete'])) {
- if ($user->picture && file_exists($user->picture)) {
- file_delete($user->picture);
+ if ($account->picture && file_exists($account->picture)) {
+ file_delete($account->picture);
}
$edit['picture'] = '';
}
Modified: branches/upstream/current-6/themes/bluemarine/bluemarine.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/bluemarine/bluemarine.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/themes/bluemarine/bluemarine.info (original)
+++ branches/upstream/current-6/themes/bluemarine/bluemarine.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/themes/chameleon/chameleon.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/chameleon/chameleon.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/chameleon.info (original)
+++ branches/upstream/current-6/themes/chameleon/chameleon.info Sun Mar 1 17:25:23 2009
@@ -12,8 +12,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/themes/chameleon/marvin/marvin.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/chameleon/marvin/marvin.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/marvin/marvin.info (original)
+++ branches/upstream/current-6/themes/chameleon/marvin/marvin.info Sun Mar 1 17:25:23 2009
@@ -7,8 +7,8 @@
core = 6.x
base theme = chameleon
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/themes/garland/garland.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/garland.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/garland.info (original)
+++ branches/upstream/current-6/themes/garland/garland.info Sun Mar 1 17:25:23 2009
@@ -7,8 +7,8 @@
stylesheets[all][] = style.css
stylesheets[print][] = print.css
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/themes/garland/minnelli/minnelli.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/minnelli/minnelli.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/minnelli/minnelli.info (original)
+++ branches/upstream/current-6/themes/garland/minnelli/minnelli.info Sun Mar 1 17:25:23 2009
@@ -6,8 +6,8 @@
base theme = garland
stylesheets[all][] = minnelli.css
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
Modified: branches/upstream/current-6/themes/garland/template.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/template.php?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/template.php (original)
+++ branches/upstream/current-6/themes/garland/template.php Sun Mar 1 17:25:23 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: template.php,v 1.16 2007/10/11 09:51:29 goba Exp $
+// $Id: template.php,v 1.16.2.1 2009/02/25 11:47:37 goba Exp $
/**
* Sets the body-tag class attribute.
@@ -94,7 +94,7 @@
global $language;
$iecss = '<link type="text/css" rel="stylesheet" media="all" href="'. base_path() . path_to_theme() .'/fix-ie.css" />';
- if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) {
+ if ($language->direction == LANGUAGE_RTL) {
$iecss .= '<style type="text/css" media="all">@import "'. base_path() . path_to_theme() .'/fix-ie-rtl.css";</style>';
}
Modified: branches/upstream/current-6/themes/pushbutton/pushbutton.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/pushbutton/pushbutton.info?rev=2011&op=diff
==============================================================================
--- branches/upstream/current-6/themes/pushbutton/pushbutton.info (original)
+++ branches/upstream/current-6/themes/pushbutton/pushbutton.info Sun Mar 1 17:25:23 2009
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2009-01-14
-version = "6.9"
+; Information added by drupal.org packaging script on 2009-02-25
+version = "6.10"
project = "drupal"
-datestamp = "1231976413"
+datestamp = "1235596218"
More information about the Pkg-drupal-commits
mailing list