[Pkg-drupal-commits] r1849 - in /branches/upstream/current-5: ./ includes/ modules/aggregator/ modules/block/ modules/blog/ modules/blogapi/ modules/book/ modules/color/ modules/comment/ modules/contact/ modules/drupal/ modules/filter/ modules/forum/ modules/help/ modules/legacy/ modules/locale/ modules/menu/ modules/node/ modules/path/ modules/ping/ modules/poll/ modules/profile/ modules/search/ modules/statistics/ modules/system/ modules/taxonomy/ modules/throttle/ modules/tracker/ modules/upload/ modules/user/ modules/watchdog/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Fri Jan 11 14:01:03 UTC 2008
Author: luigi
Date: Fri Jan 11 14:01:02 2008
New Revision: 1849
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1849
Log:
[svn-upgrade] Integrating new upstream version, drupal5 (5.6)
Modified:
branches/upstream/current-5/CHANGELOG.txt
branches/upstream/current-5/INSTALL.txt
branches/upstream/current-5/includes/bootstrap.inc
branches/upstream/current-5/includes/common.inc
branches/upstream/current-5/includes/database.inc
branches/upstream/current-5/includes/file.inc
branches/upstream/current-5/includes/form.inc
branches/upstream/current-5/includes/image.inc
branches/upstream/current-5/includes/locale.inc
branches/upstream/current-5/includes/xmlrpc.inc
branches/upstream/current-5/modules/aggregator/aggregator.info
branches/upstream/current-5/modules/aggregator/aggregator.module
branches/upstream/current-5/modules/block/block.info
branches/upstream/current-5/modules/blog/blog.info
branches/upstream/current-5/modules/blogapi/blogapi.info
branches/upstream/current-5/modules/book/book.info
branches/upstream/current-5/modules/color/color.info
branches/upstream/current-5/modules/comment/comment.info
branches/upstream/current-5/modules/contact/contact.info
branches/upstream/current-5/modules/drupal/drupal.info
branches/upstream/current-5/modules/filter/filter.info
branches/upstream/current-5/modules/filter/filter.module
branches/upstream/current-5/modules/forum/forum.info
branches/upstream/current-5/modules/help/help.info
branches/upstream/current-5/modules/legacy/legacy.info
branches/upstream/current-5/modules/locale/locale.info
branches/upstream/current-5/modules/menu/menu.info
branches/upstream/current-5/modules/menu/menu.module
branches/upstream/current-5/modules/node/content_types.inc
branches/upstream/current-5/modules/node/node.info
branches/upstream/current-5/modules/node/node.module
branches/upstream/current-5/modules/path/path.info
branches/upstream/current-5/modules/ping/ping.info
branches/upstream/current-5/modules/poll/poll.info
branches/upstream/current-5/modules/poll/poll.module
branches/upstream/current-5/modules/profile/profile.info
branches/upstream/current-5/modules/search/search.info
branches/upstream/current-5/modules/statistics/statistics.info
branches/upstream/current-5/modules/system/system.info
branches/upstream/current-5/modules/system/system.install
branches/upstream/current-5/modules/system/system.module
branches/upstream/current-5/modules/taxonomy/taxonomy.info
branches/upstream/current-5/modules/taxonomy/taxonomy.module
branches/upstream/current-5/modules/throttle/throttle.info
branches/upstream/current-5/modules/tracker/tracker.info
branches/upstream/current-5/modules/upload/upload.info
branches/upstream/current-5/modules/upload/upload.module
branches/upstream/current-5/modules/user/user.info
branches/upstream/current-5/modules/user/user.module
branches/upstream/current-5/modules/watchdog/watchdog.info
Modified: branches/upstream/current-5/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/CHANGELOG.txt?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/CHANGELOG.txt (original)
+++ branches/upstream/current-5/CHANGELOG.txt Fri Jan 11 14:01:02 2008
@@ -1,4 +1,11 @@
-// $Id: CHANGELOG.txt,v 1.173.2.15 2007/12/06 20:23:24 drumm Exp $
+// $Id: CHANGELOG.txt,v 1.173.2.17 2008/01/10 22:14:24 drumm Exp $
+
+Drupal 5.6, 2008-01-10
+----------------------
+- fixed a variety of small bugs.
+- fixed a security issue (Cross site request forgery), see SA-2008-005
+- fixed a security issue (Cross site scripting, UTF8), see SA-2008-006
+- fixed a security issue (Cross site scripting, register_globals), see SA-2008-007
Drupal 5.5, 2007-12-06
----------------------
@@ -108,6 +115,12 @@
* added nested lists generation.
* added a self-clearing block class.
+Drupal 4.7.11, 2008-01-10
+-------------------------
+- fixed a security issue (Cross site request forgery), see SA-2008-005
+- fixed a security issue (Cross site scripting, UTF8), see SA-2008-006
+- fixed a security issue (Cross site scripting, register_globals), see SA-2008-007
+
Drupal 4.7.10, 2007-12-06
-------------------------
- fixed taxonomy feed bug introduced by SA-2007-031
Modified: branches/upstream/current-5/INSTALL.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/INSTALL.txt?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/INSTALL.txt (original)
+++ branches/upstream/current-5/INSTALL.txt Fri Jan 11 14:01:02 2008
@@ -1,4 +1,4 @@
-// $Id: INSTALL.txt,v 1.39.2.2 2007/07/26 05:29:58 drumm Exp $
+// $Id: INSTALL.txt,v 1.39.2.3 2008/01/10 22:14:24 drumm Exp $
CONTENTS OF THIS FILE
---------------------
@@ -22,7 +22,7 @@
REQUIREMENTS
------------
-Drupal requires a web server, PHP4 (4.3.3 or greater) or PHP5
+Drupal requires a web server, PHP4 (4.3.5 or greater) or PHP5
(http://www.php.net/) and either MySQL (http://www.mysql.com/) or PostgreSQL
(http://www.postgresql.org/). The Apache web server and MySQL database are
recommended; other web server and database combinations such as IIS and
Modified: branches/upstream/current-5/includes/bootstrap.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/bootstrap.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/includes/bootstrap.inc (original)
+++ branches/upstream/current-5/includes/bootstrap.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: bootstrap.inc,v 1.145.2.7 2007/10/28 04:53:14 drumm Exp $
+// $Id: bootstrap.inc,v 1.145.2.8 2008/01/10 22:14:24 drumm Exp $
/**
* @file
@@ -626,9 +626,48 @@
/**
* Encode special characters in a plain-text string for display as HTML.
+ *
+ * Uses drupal_validate_utf8 to prevent cross site scripting attacks on
+ * Internet Explorer 6.
*/
function check_plain($text) {
- return htmlspecialchars($text, ENT_QUOTES);
+ return drupal_validate_utf8($text) ? htmlspecialchars($text, ENT_QUOTES) : '';
+}
+
+/**
+ * Checks whether a string is valid UTF-8.
+ *
+ * All functions designed to filter input should use drupal_validate_utf8
+ * to ensure they operate on valid UTF-8 strings to prevent bypass of the
+ * filter.
+ *
+ * When text containing an invalid UTF-8 lead byte (0xC0 - 0xFF) is presented
+ * as UTF-8 to Internet Explorer 6, the program may misinterpret subsequent
+ * bytes. When these subsequent bytes are HTML control characters such as
+ * quotes or angle brackets, parts of the text that were deemed safe by filters
+ * end up in locations that are potentially unsafe; An onerror attribute that
+ * is outside of a tag, and thus deemed safe by a filter, can be interpreted
+ * by the browser as if it were inside the tag.
+ *
+ * This function exploits preg_match behaviour (since PHP 4.3.5) when used
+ * with the u modifier, as a fast way to find invalid UTF-8. When the matched
+ * string contains an invalid byte sequence, it will fail silently.
+ *
+ * preg_match may not fail on 4 and 5 octet sequences, even though they
+ * are not supported by the specification.
+ *
+ * The specific preg_match behaviour is present since PHP 4.3.5.
+ *
+ * @param $text
+ * The text to check.
+ * @return
+ * TRUE if the text is valid UTF-8, FALSE if not.
+ */
+function drupal_validate_utf8($text) {
+ if (strlen($text) == 0) {
+ return TRUE;
+ }
+ return (preg_match('/^./us', $text) == 1);
}
/**
Modified: branches/upstream/current-5/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/common.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/includes/common.inc (original)
+++ branches/upstream/current-5/includes/common.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.611.2.12 2007/10/17 21:28:59 drumm Exp $
+// $Id: common.inc,v 1.611.2.14 2007/12/27 09:21:23 drumm Exp $
/**
* @file
@@ -454,6 +454,11 @@
'User-Agent' => 'User-Agent: Drupal (+http://drupal.org/)',
'Content-Length' => 'Content-Length: '. strlen($data)
);
+
+ // If the server url has a user then attempt to use basic authentication
+ if (isset($uri['user'])) {
+ $defaults['Authorization'] = 'Authorization: Basic '. base64_encode($uri['user'] . (!empty($uri['pass']) ? ":". $uri['pass'] : ''));
+ }
foreach ($headers as $header => $value) {
$defaults[$header] = $header .': '. $value;
@@ -1267,7 +1272,7 @@
* an HTML string containing a link to the given path.
*/
function l($text, $path, $attributes = array(), $query = NULL, $fragment = NULL, $absolute = FALSE, $html = FALSE) {
- if ($path == $_GET['q']) {
+ if (($path == $_GET['q']) || ($path == '<front>' && drupal_is_front_page())) {
if (isset($attributes['class'])) {
$attributes['class'] .= ' active';
}
Modified: branches/upstream/current-5/includes/database.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/database.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/includes/database.inc (original)
+++ branches/upstream/current-5/includes/database.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: database.inc,v 1.62.2.5 2007/11/07 05:55:46 drumm Exp $
+// $Id: database.inc,v 1.62.2.6 2008/01/07 00:55:44 drumm Exp $
/**
* @file
@@ -100,7 +100,7 @@
*/
function db_set_active($name = 'default') {
global $db_url, $db_type, $active_db;
- static $db_conns;
+ static $db_conns, $active_name = FALSE;
if (!isset($db_conns[$name])) {
// Initiate a new connection, using the named DB URL specified.
@@ -128,11 +128,12 @@
$db_conns[$name] = db_connect($connect_url);
}
- $previous_db = $active_db;
+ $previous_name = $active_name;
// Set the active connection.
+ $active_name = $name;
$active_db = $db_conns[$name];
- return array_search($previous_db, $db_conns);
+ return $previous_name;
}
/**
Modified: branches/upstream/current-5/includes/file.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/file.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/includes/file.inc (original)
+++ branches/upstream/current-5/includes/file.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: file.inc,v 1.90.2.1 2007/05/31 05:48:58 drumm Exp $
+// $Id: file.inc,v 1.90.2.3 2008/01/07 01:00:22 drumm Exp $
/**
* @file
@@ -223,8 +223,9 @@
$file = new stdClass();
$file->filename = trim(basename($_FILES["files"]["name"][$source]), '.');
- // Create temporary name/path for newly uploaded files.
- $file->filepath = tempnam(file_directory_temp(), 'tmp_');
+ // Create temporary name/path for newly uploaded files. On Windows, tempnam()
+ // requires an absolute path, so we use realpath().
+ $file->filepath = tempnam(realpath(file_directory_temp()), 'tmp_');
$file->filemime = $_FILES["files"]["type"][$source];
@@ -523,7 +524,8 @@
*/
function file_save_data($data, $dest, $replace = FILE_EXISTS_RENAME) {
$temp = file_directory_temp();
- $file = tempnam($temp, 'file');
+ // On Windows, tempnam() requires an absolute path, so we use realpath().
+ $file = tempnam(realpath($temp), 'file');
if (!$fp = fopen($file, 'wb')) {
drupal_set_message(t('The file could not be created.'), 'error');
return 0;
@@ -719,7 +721,7 @@
* Determine the maximum file upload size by querying the PHP settings.
*
* @return
- * A file size limit in MB based on the PHP upload_max_filesize and post_max_size
+ * A file size limit in bytes based on the PHP upload_max_filesize and post_max_size
*/
function file_upload_max_size() {
static $max_size = -1;
Modified: branches/upstream/current-5/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/form.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/includes/form.inc (original)
+++ branches/upstream/current-5/includes/form.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.174.2.12 2007/11/10 02:24:47 drumm Exp $
+// $Id: form.inc,v 1.174.2.13 2007/12/27 08:41:52 drumm Exp $
/**
* @defgroup form Form generation
@@ -1430,7 +1430,7 @@
function theme_form($element) {
// Anonymous div to satisfy XHTML compliance.
$action = $element['#action'] ? 'action="' . check_url($element['#action']) . '" ' : '';
- return '<form '. $action . ' method="'. $element['#method'] .'" '. 'id="'. $element['#id'] .'"'. drupal_attributes($element['#attributes']) .">\n<div>". $element['#children'] ."\n</div></form>\n";
+ return '<form '. $action .' accept-charset="UTF-8" method="'. $element['#method'] .'" '. 'id="'. $element['#id'] .'"'. drupal_attributes($element['#attributes']) .">\n<div>". $element['#children'] ."\n</div></form>\n";
}
/**
Modified: branches/upstream/current-5/includes/image.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/image.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/includes/image.inc (original)
+++ branches/upstream/current-5/includes/image.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: image.inc,v 1.17 2006/12/26 14:01:41 dries Exp $
+// $Id: image.inc,v 1.17.2.1 2007/12/27 08:31:24 drumm Exp $
/**
* Return a list of available toolkits.
@@ -235,7 +235,7 @@
return FALSE;
}
- $res = imageCreateTrueColor($width, $height);
+ $res = imagecreatetruecolor($width, $height);
if ($info['extension'] == 'png') {
$transparency = imagecolorallocatealpha($res, 0, 0, 0, 127);
imagealphablending($res, FALSE);
@@ -243,11 +243,29 @@
imagealphablending($res, TRUE);
imagesavealpha($res, TRUE);
}
- imageCopyResampled($res, $im, 0, 0, 0, 0, $width, $height, $info['width'], $info['height']);
+ elseif ($info['extension'] == 'gif') {
+ // If we have a specific transparent color.
+ $transparency_index = imagecolortransparent($im);
+ if ($transparency_index >= 0) {
+ // Get the original image's transparent color's RGB values.
+ $transparent_color = imagecolorsforindex($im, $transparency_index);
+ // Allocate the same color in the new image resource.
+ $transparency_index = imagecolorallocate($res, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']);
+ // Completely fill the background of the new image with allocated color.
+ imagefill($res, 0, 0, $transparency_index);
+ // Set the background color for new image to transparent.
+ imagecolortransparent($res, $transparency_index);
+ // Find number of colors in the images palette.
+ $number_colors = imagecolorstotal($im);
+ // Convert from true color to palette to fix transparency issues.
+ imagetruecolortopalette($res, TRUE, $number_colors);
+ }
+ }
+ imagecopyresampled($res, $im, 0, 0, 0, 0, $width, $height, $info['width'], $info['height']);
$result = image_gd_close($res, $destination, $info['extension']);
- imageDestroy($res);
- imageDestroy($im);
+ imagedestroy($res);
+ imagedestroy($im);
return $result;
}
Modified: branches/upstream/current-5/includes/locale.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/locale.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/includes/locale.inc (original)
+++ branches/upstream/current-5/includes/locale.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: locale.inc,v 1.105.2.4 2007/05/21 00:20:02 drumm Exp $
+// $Id: locale.inc,v 1.105.2.5 2007/12/17 01:53:52 drumm Exp $
/**
* @file
@@ -526,6 +526,10 @@
while (!feof($fd)) {
$line = fgets($fd, 10*1024); // A line should not be this long
+ if ($lineno == 0) {
+ // The first line might come with a UTF-8 BOM, which should be removed.
+ $line = str_replace("\xEF\xBB\xBF", '', $line);
+ }
$lineno++;
$line = trim(strtr($line, array("\\\n" => "")));
Modified: branches/upstream/current-5/includes/xmlrpc.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/xmlrpc.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/includes/xmlrpc.inc (original)
+++ branches/upstream/current-5/includes/xmlrpc.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: xmlrpc.inc,v 1.38.2.1 2007/04/19 02:05:15 drumm Exp $
+// $Id: xmlrpc.inc,v 1.38.2.2 2007/12/20 07:53:34 drumm Exp $
/*
Drupal XML-RPC library. Based on the IXR - The Incutio XML-RPC Library - (c) Incutio Ltd 2002-2005
@@ -390,12 +390,13 @@
$xmlrpc_date->iso8601 = date('Ymd\TH:i:s');
}
else {
+ $time = str_replace(array('-', ':'), '', $time);
$xmlrpc_date->year = substr($time, 0, 4);
$xmlrpc_date->month = substr($time, 4, 2);
$xmlrpc_date->day = substr($time, 6, 2);
$xmlrpc_date->hour = substr($time, 9, 2);
- $xmlrpc_date->minute = substr($time, 12, 2);
- $xmlrpc_date->second = substr($time, 15, 2);
+ $xmlrpc_date->minute = substr($time, 11, 2);
+ $xmlrpc_date->second = substr($time, 14, 2);
$xmlrpc_date->iso8601 = $time;
}
return $xmlrpc_date;
Modified: branches/upstream/current-5/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/aggregator/aggregator.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-5/modules/aggregator/aggregator.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/aggregator/aggregator.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/aggregator/aggregator.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/aggregator/aggregator.module (original)
+++ branches/upstream/current-5/modules/aggregator/aggregator.module Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: aggregator.module,v 1.324.2.1 2007/07/09 03:38:22 drumm Exp $
+// $Id: aggregator.module,v 1.324.2.2 2008/01/10 22:14:24 drumm Exp $
/**
* @file
@@ -51,11 +51,14 @@
'callback arguments' => array('aggregator_form_category'),
'access' => $edit,
'type' => MENU_LOCAL_TASK);
- $items[] = array('path' => 'admin/content/aggregator/remove',
+ $items[] = array(
+ 'path' => 'admin/content/aggregator/remove',
'title' => t('Remove items'),
- 'callback' => 'aggregator_admin_remove_feed',
+ 'callback' => 'drupal_get_form',
+ 'callback arguments' => array('aggregator_admin_remove_feed'),
'access' => $edit,
- 'type' => MENU_CALLBACK);
+ 'type' => MENU_CALLBACK,
+ );
$items[] = array('path' => 'admin/content/aggregator/update',
'title' => t('Update items'),
'callback' => 'aggregator_admin_refresh_feed',
@@ -1001,12 +1004,29 @@
return $output;
}
-/**
- * Menu callback; removes all items from a feed, then redirects to the overview page.
- */
-function aggregator_admin_remove_feed($feed) {
- aggregator_remove(aggregator_get_feed($feed));
- drupal_goto('admin/content/aggregator');
+function aggregator_admin_remove_feed($fid) {
+ $feed = aggregator_get_feed($fid);
+ return confirm_form(
+ array(
+ 'feed' => array(
+ '#type' => 'value',
+ '#value' => $feed,
+ ),
+ ),
+ t('Are you sure you want to remove all items from the feed %feed?', array('%feed' => $feed['title'])),
+ 'admin/content/aggregator',
+ t('This action cannot be undone.'),
+ t('Remove items'),
+ t('Cancel')
+ );
+}
+
+/**
+ * Remove all items from a feed and redirect to the overview page.
+ */
+function aggregator_admin_remove_feed_submit($form_id, $form_values) {
+ aggregator_remove($form_values['feed']);
+ return 'admin/content/aggregator';
}
/**
Modified: branches/upstream/current-5/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/block/block.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/block/block.info (original)
+++ branches/upstream/current-5/modules/block/block.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/blog/blog.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blog/blog.info (original)
+++ branches/upstream/current-5/modules/blog/blog.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/blogapi/blogapi.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-5/modules/blogapi/blogapi.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/book/book.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/book/book.info (original)
+++ branches/upstream/current-5/modules/book/book.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/color/color.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/color/color.info (original)
+++ branches/upstream/current-5/modules/color/color.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/comment/comment.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/comment/comment.info (original)
+++ branches/upstream/current-5/modules/comment/comment.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/contact/contact.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/contact/contact.info (original)
+++ branches/upstream/current-5/modules/contact/contact.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/drupal/drupal.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/drupal/drupal.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/drupal/drupal.info (original)
+++ branches/upstream/current-5/modules/drupal/drupal.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/filter/filter.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.info (original)
+++ branches/upstream/current-5/modules/filter/filter.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/filter/filter.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/filter/filter.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.module (original)
+++ branches/upstream/current-5/modules/filter/filter.module Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: filter.module,v 1.160.2.3 2007/08/08 06:54:10 drumm Exp $
+// $Id: filter.module,v 1.160.2.5 2008/01/10 22:14:24 drumm Exp $
/**
* @file
@@ -604,12 +604,21 @@
if (!empty($form)) {
$form = system_settings_form($form);
+ $form['format'] = array('#type' => 'hidden', '#value' => $format->format);
+ $form['#submit'][] = 'filter_admin_configure_submit';
}
else {
$form['error'] = array('#value' => t('No settings are available.'));
}
return $form;
+}
+
+/**
+ * Clear the filter's cache when configuration settings are saved.
+ */
+function filter_admin_configure_submit($form_id, $form_values) {
+ cache_clear_all($form_values['format'] .':', 'cache_filter', TRUE);
}
/**
@@ -1259,6 +1268,11 @@
* The format to use.
*/
function filter_xss($string, $allowed_tags = array('a', 'em', 'strong', 'cite', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd')) {
+ // Only operate on valid UTF-8 strings. This is necessary to prevent cross
+ // site scripting issues on Internet Explorer 6.
+ if (!drupal_validate_utf8($string)) {
+ return '';
+ }
// Store the input format
_filter_xss_split($allowed_tags, TRUE);
// Remove NUL characters (ignored by some browsers)
Modified: branches/upstream/current-5/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/forum/forum.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/forum/forum.info (original)
+++ branches/upstream/current-5/modules/forum/forum.info Fri Jan 11 14:01:02 2008
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/help/help.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/help/help.info (original)
+++ branches/upstream/current-5/modules/help/help.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/legacy/legacy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/legacy/legacy.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/legacy/legacy.info (original)
+++ branches/upstream/current-5/modules/legacy/legacy.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/locale/locale.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/locale/locale.info (original)
+++ branches/upstream/current-5/modules/locale/locale.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/menu/menu.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/menu/menu.info (original)
+++ branches/upstream/current-5/modules/menu/menu.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/menu/menu.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/menu/menu.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/menu/menu.module (original)
+++ branches/upstream/current-5/modules/menu/menu.module Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.module,v 1.100.2.1 2007/07/26 19:16:45 drumm Exp $
+// $Id: menu.module,v 1.100.2.2 2008/01/07 02:13:58 drumm Exp $
/**
* @file
@@ -395,8 +395,9 @@
'#description' => t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.'),
);
- // Always enable menu items (but not menus) when editing them.
- if (!($item['type'] & MENU_IS_ROOT)) {
+ // Always enable menu items (but not menus) when editing them, unless already
+ // conditionally visible.
+ if (!($item['type'] & (MENU_IS_ROOT | MENU_VISIBLE_IF_HAS_CHILDREN))) {
$item['type'] |= MENU_VISIBLE_IN_TREE | MENU_VISIBLE_IN_BREADCRUMB;
}
Modified: branches/upstream/current-5/modules/node/content_types.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/node/content_types.inc?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/content_types.inc (original)
+++ branches/upstream/current-5/modules/node/content_types.inc Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: content_types.inc,v 1.24.2.2 2007/07/26 19:16:46 drumm Exp $
+// $Id: content_types.inc,v 1.24.2.3 2007/12/27 09:57:47 drumm Exp $
/**
* @file
@@ -226,9 +226,6 @@
// Work out what the type was before the user submitted this form
$old_type = trim($form_values['old_type']);
- if (empty($old_type)) {
- $old_type = $type->type;
- }
$types = node_get_types('names');
@@ -248,7 +245,7 @@
$names = array_flip($types);
if (isset($names[$type->name]) && $names[$type->name] != $old_type) {
- form_set_error('name', t('The human-readable name %name is already taken.', array('%name' => $names[$type->name])));
+ form_set_error('name', t('The human-readable name %name is already taken.', array('%name' => $type->name)));
}
}
Modified: branches/upstream/current-5/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/node/node.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/node.info (original)
+++ branches/upstream/current-5/modules/node/node.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/node/node.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/node/node.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/node.module (original)
+++ branches/upstream/current-5/modules/node/node.module Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: node.module,v 1.776.2.21 2007/09/29 23:41:28 drumm Exp $
+// $Id: node.module,v 1.776.2.22 2008/01/07 01:31:26 drumm Exp $
/**
* @file
@@ -1223,12 +1223,14 @@
$items[] = array(
'path' => 'node/'. arg(1) .'/revisions/'. arg(3) .'/delete',
'callback' => 'node_revision_delete',
- 'callback arguments' => array(arg(1), arg(3)),
+ 'callback arguments' => array(arg(1), arg(3)),
+ 'type' => MENU_CALLBACK,
);
$items[] = array(
'path' => 'node/'. arg(1) .'/revisions/'. arg(3) .'/revert',
'callback' => 'node_revision_revert',
- 'callback arguments' => array(arg(1), arg(3)),
+ 'callback arguments' => array(arg(1), arg(3)),
+ 'type' => MENU_CALLBACK,
);
}
}
Modified: branches/upstream/current-5/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/path/path.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/path/path.info (original)
+++ branches/upstream/current-5/modules/path/path.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/ping/ping.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/ping/ping.info (original)
+++ branches/upstream/current-5/modules/ping/ping.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/poll/poll.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/poll/poll.info (original)
+++ branches/upstream/current-5/modules/poll/poll.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/poll/poll.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/poll/poll.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/poll/poll.module (original)
+++ branches/upstream/current-5/modules/poll/poll.module Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: poll.module,v 1.222.2.2 2007/10/07 00:21:18 drumm Exp $
+// $Id: poll.module,v 1.222.2.4 2007/12/27 08:26:00 drumm Exp $
/**
* @file
@@ -217,6 +217,7 @@
db_query("INSERT INTO {poll} (nid, runtime, active) VALUES (%d, %d, %d)", $node->nid, $node->runtime, $node->active);
+ $i = 0;
foreach ($node->choice as $choice) {
if ($choice['chtext'] != '') {
db_query("INSERT INTO {poll_choices} (nid, chtext, chvotes, chorder) VALUES (%d, '%s', %d, %d)", $node->nid, $choice['chtext'], $choice['chvotes'], $i++);
@@ -328,10 +329,9 @@
function poll_page() {
// List all polls.
- $sql = "SELECT n.nid, n.title, p.active, n.created, SUM(c.chvotes) AS votes FROM {node} n INNER JOIN {poll} p ON n.nid = p.nid INNER JOIN {poll_choices} c ON n.nid = c.nid WHERE n.status = 1 GROUP BY n.nid, n.title, p.active, n.created ORDER BY n.created DESC";
+ $sql = db_rewrite_sql("SELECT n.nid, n.title, p.active, n.created, SUM(c.chvotes) AS votes FROM {node} n INNER JOIN {poll} p ON n.nid = p.nid INNER JOIN {poll_choices} c ON n.nid = c.nid WHERE n.status = 1 GROUP BY n.nid, n.title, p.active, n.created ORDER BY n.created DESC");
// Count all polls for the pager.
- $count_sql = 'SELECT COUNT(*) FROM {node} n INNER JOIN {poll} p ON n.nid = p.nid WHERE n.status = 1';
- $sql = db_rewrite_sql($sql);
+ $count_sql = db_rewrite_sql('SELECT COUNT(*) FROM {node} n INNER JOIN {poll} p ON n.nid = p.nid WHERE n.status = 1');
$result = pager_query($sql, 15, 0, $count_sql);
$output = '<ul>';
while ($node = db_fetch_object($result)) {
Modified: branches/upstream/current-5/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/profile/profile.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/profile/profile.info (original)
+++ branches/upstream/current-5/modules/profile/profile.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/search/search.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/search/search.info (original)
+++ branches/upstream/current-5/modules/search/search.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/statistics/statistics.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/statistics/statistics.info (original)
+++ branches/upstream/current-5/modules/statistics/statistics.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/system/system.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.info (original)
+++ branches/upstream/current-5/modules/system/system.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/system/system.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/system/system.install?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.install (original)
+++ branches/upstream/current-5/modules/system/system.install Fri Jan 11 14:01:02 2008
@@ -1,7 +1,7 @@
<?php
-// $Id: system.install,v 1.69.2.8 2007/11/07 05:53:24 drumm Exp $
-
-define('DRUPAL_MINIMUM_PHP', '4.3.3');
+// $Id: system.install,v 1.69.2.9 2008/01/10 22:14:24 drumm Exp $
+
+define('DRUPAL_MINIMUM_PHP', '4.3.5');
define('DRUPAL_MINIMUM_MYSQL', '3.23.17'); // If using MySQL
define('DRUPAL_MINIMUM_PGSQL', '7.3'); // If using PostgreSQL
@@ -37,6 +37,10 @@
);
if (version_compare(phpversion(), DRUPAL_MINIMUM_PHP) < 0) {
$requirements['php']['description'] = $t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => DRUPAL_MINIMUM_PHP));
+ $requirements['php']['severity'] = REQUIREMENT_ERROR;
+ }
+ if (ini_get('register_globals')) {
+ $requirements['php']['description'] = $t('<em>register_globals</em> is enabled. Drupal requires this configuration directive to be disabled. Your site may not be secure when <em>register_globals</em> is enabled. The PHP manual has instructions for <a href="http://php.net/configuration.changes">how to change configuration settings</a>.');
$requirements['php']['severity'] = REQUIREMENT_ERROR;
}
Modified: branches/upstream/current-5/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/system/system.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.module (original)
+++ branches/upstream/current-5/modules/system/system.module Fri Jan 11 14:01:02 2008
@@ -1,12 +1,12 @@
<?php
-// $Id: system.module,v 1.440.2.23 2007/12/06 20:23:24 drumm Exp $
+// $Id: system.module,v 1.440.2.27 2008/01/10 22:14:24 drumm Exp $
/**
* @file
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '5.5');
+define('VERSION', '5.6');
/**
* Implementation of hook_help().
@@ -458,7 +458,7 @@
}
}
-/*
+/**
* Returns a fieldset containing the theme select form.
*
* @param $description
@@ -1246,6 +1246,9 @@
function system_modules($form_values = NULL) {
// Get current list of modules.
$files = module_rebuild_cache();
+
+ uasort($files, 'system_sort_modules_by_info_name');
+
if ($confirm_form = system_modules_confirm_form($files, $form_values)) {
return $confirm_form;
}
@@ -1366,6 +1369,10 @@
$form['#action'] = url('admin/build/modules/list/confirm');
return $form;
+}
+
+function system_sort_modules_by_info_name($a, $b) {
+ return strcasecmp($a->info['name'], $b->info['name']);
}
/**
Modified: branches/upstream/current-5/modules/taxonomy/taxonomy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/taxonomy/taxonomy.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/taxonomy/taxonomy.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/taxonomy/taxonomy.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.module (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.module Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.module,v 1.330.2.14 2007/12/06 18:16:38 drumm Exp $
+// $Id: taxonomy.module,v 1.330.2.15 2007/12/20 07:48:11 drumm Exp $
/**
* @file
@@ -622,10 +622,12 @@
function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
$vocabulary = taxonomy_get_vocabulary($vid);
$help = ($help) ? $help : $vocabulary->help;
- $blank = 0;
if (!$vocabulary->multiple) {
$blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -');
+ }
+ else {
+ $blank = ($vocabulary->required) ? 0 : t('- None -');
}
return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank);
Modified: branches/upstream/current-5/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/throttle/throttle.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/throttle/throttle.info (original)
+++ branches/upstream/current-5/modules/throttle/throttle.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/tracker/tracker.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/tracker/tracker.info (original)
+++ branches/upstream/current-5/modules/tracker/tracker.info Fri Jan 11 14:01:02 2008
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/upload/upload.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/upload/upload.info (original)
+++ branches/upstream/current-5/modules/upload/upload.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/upload/upload.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/upload/upload.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/upload/upload.module (original)
+++ branches/upstream/current-5/modules/upload/upload.module Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: upload.module,v 1.148.2.2 2007/10/17 21:29:00 drumm Exp $
+// $Id: upload.module,v 1.148.2.3 2008/01/07 01:00:23 drumm Exp $
/**
* @file
@@ -117,7 +117,7 @@
$default_uploadsize = $form_values['upload_uploadsize_default'];
$default_usersize = $form_values['upload_usersize_default'];
- $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size MB.', array('%size' => file_upload_max_size())).'<br/>';
+ $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))).'<br/>';
$more_info = t("Depending on your sever environment, these settings may be changed in the system-wide php.ini file, a php.ini file in your Drupal root directory, in your Drupal site's settings.php file, or in the .htaccess file in your Drupal root directory.");
if (!is_numeric($default_uploadsize) || ($default_uploadsize <= 0)) {
@@ -126,7 +126,7 @@
if (!is_numeric($default_usersize) || ($default_usersize <= 0)) {
form_set_error('upload_usersize_default', t('The %role file size limit must be a number and greater than zero.', array('%role' => t('default'))));
}
- if ($default_uploadsize > file_upload_max_size()) {
+ if ($default_uploadsize * 1024 * 1024 > file_upload_max_size()) {
form_set_error('upload_uploadsize_default', $exceed_max_msg . $more_info);
$more_info = '';
}
@@ -144,7 +144,7 @@
if (!is_numeric($usersize) || ($usersize <= 0)) {
form_set_error('upload_usersize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role)));
}
- if ($uploadsize > file_upload_max_size()) {
+ if ($uploadsize * 1024 * 1024 > file_upload_max_size()) {
form_set_error('upload_uploadsize_'. $rid, $exceed_max_msg . $more_info);
$more_info = '';
}
Modified: branches/upstream/current-5/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/user/user.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.info (original)
+++ branches/upstream/current-5/modules/user/user.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
Modified: branches/upstream/current-5/modules/user/user.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/user/user.module?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.module (original)
+++ branches/upstream/current-5/modules/user/user.module Fri Jan 11 14:01:02 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.745.2.23 2007/12/06 19:49:14 drumm Exp $
+// $Id: user.module,v 1.745.2.26 2008/01/07 02:30:35 drumm Exp $
/**
* @file
@@ -885,10 +885,8 @@
function user_auth_help_links() {
$links = array();
- foreach (module_list() as $module) {
- if (module_hook($module, 'auth')) {
- $links[] = l(module_invoke($module, 'info', 'name'), 'user/help', array(), NULL, $module);
- }
+ foreach (module_implements('auth') as $module) {
+ $links[] = l(module_invoke($module, 'info', 'name'), 'user/help', array(), NULL, $module);
}
return $links;
}
@@ -1572,7 +1570,7 @@
case 'pass_subject':
return t('Replacement login information for !username at !site', $variables);
case 'pass_body':
- return t("!username,\n\nA request to reset the password for your account has been made at !site.\n\nYou may now log in to !uri_brief clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.", $variables);
+ return t("!username,\n\nA request to reset the password for your account has been made at !site.\n\nYou may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.", $variables);
}
}
}
@@ -2448,6 +2446,8 @@
}
function _user_sort($a, $b) {
+ $a = (array)$a + array('weight' => 0, 'title' => '');
+ $b = (array)$b + array('weight' => 0, 'title' => '');
return $a['weight'] < $b['weight'] ? -1 : ($a['weight'] > $b['weight'] ? 1 : ($a['title'] < $b['title'] ? -1 : 1));
}
Modified: branches/upstream/current-5/modules/watchdog/watchdog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/watchdog/watchdog.info?rev=1849&op=diff
==============================================================================
--- branches/upstream/current-5/modules/watchdog/watchdog.info (original)
+++ branches/upstream/current-5/modules/watchdog/watchdog.info Fri Jan 11 14:01:02 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-12-06
-version = "5.5"
+; Information added by drupal.org packaging script on 2008-01-10
+version = "5.6"
project = "drupal"
-datestamp = "1196973009"
+datestamp = "1200003604"
More information about the Pkg-drupal-commits
mailing list