[Pkg-drupal-commits] r1823 - in /branches/upstream/current-5: ./ includes/ misc/ 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/ themes/chameleon/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Sat Oct 20 07:51:56 UTC 2007
Author: luigi
Date: Sat Oct 20 07:51:55 2007
New Revision: 1823
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1823
Log:
[svn-upgrade] Integrating new upstream version, drupal5 (5.3)
Modified:
branches/upstream/current-5/.htaccess
branches/upstream/current-5/CHANGELOG.txt
branches/upstream/current-5/includes/common.inc
branches/upstream/current-5/includes/install.inc
branches/upstream/current-5/install.php
branches/upstream/current-5/misc/favicon.ico
branches/upstream/current-5/modules/aggregator/aggregator.info
branches/upstream/current-5/modules/block/block.info
branches/upstream/current-5/modules/block/block.module
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/color/color.module
branches/upstream/current-5/modules/comment/comment.info
branches/upstream/current-5/modules/comment/comment.module
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/forum/forum.module
branches/upstream/current-5/modules/help/help.info
branches/upstream/current-5/modules/help/help.module
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/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/search/search.install
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
branches/upstream/current-5/themes/chameleon/common.css
Modified: branches/upstream/current-5/.htaccess
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/.htaccess?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/.htaccess (original)
+++ branches/upstream/current-5/.htaccess Sat Oct 20 07:51:55 2007
@@ -3,7 +3,7 @@
#
# Protect files and directories from prying eyes.
-<FilesMatch "(\.(engine|inc|info|install|module|profile|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)|code-style\.pl|Entries.*|Repository|Root|Tag|Template)$">
+<FilesMatch "\.(engine|inc|info|install|module|profile|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template)$">
Order allow,deny
</FilesMatch>
@@ -104,4 +104,4 @@
RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
</IfModule>
-# $Id: .htaccess,v 1.81.2.2 2007/05/21 01:34:59 drumm Exp $
+# $Id: .htaccess,v 1.81.2.3 2007/09/21 12:24:22 drumm Exp $
Modified: branches/upstream/current-5/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/CHANGELOG.txt?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/CHANGELOG.txt (original)
+++ branches/upstream/current-5/CHANGELOG.txt Sat Oct 20 07:51:55 2007
@@ -1,4 +1,13 @@
-// $Id: CHANGELOG.txt,v 1.173.2.8 2007/07/26 19:16:45 drumm Exp $
+// $Id: CHANGELOG.txt,v 1.173.2.10 2007/10/17 21:28:59 drumm Exp $
+
+Drupal 5.3, 2007-10-17
+----------------------
+- fixed a variety of small bugs.
+- fixed a security issue (HTTP response splitting), see SA-2007-024
+- fixed a security issue (Arbitrary code execution via installer), see SA-2007-025
+- fixed a security issue (Cross site scripting via uploads), see SA-2007-026
+- fixed a security issue (User deletion cross site request forgery), see SA-2007-029
+- fixed a security issue (API handling of unpublished comment), see SA-2007-030
Drupal 5.2, 2007-07-26
----------------------
@@ -89,6 +98,12 @@
* added nested lists generation.
* added a self-clearing block class.
+Drupal 4.7.8, 2007-10-17
+------------------------
+- fixed a security issue (HTTP response splitting), see SA-2007-024
+- fixed a security issue (Cross site scripting via uploads), see SA-2007-026
+- fixed a security issue (API handling of unpublished comment), see SA-2007-030
+
Drupal 4.7.7, 2007-07-26
------------------------
- fixed security issue (XSS), see SA-2007-018
Modified: branches/upstream/current-5/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/common.inc?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/includes/common.inc (original)
+++ branches/upstream/current-5/includes/common.inc Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.611.2.9 2007/07/26 19:16:45 drumm Exp $
+// $Id: common.inc,v 1.611.2.12 2007/10/17 21:28:59 drumm Exp $
/**
* @file
@@ -267,9 +267,8 @@
* 'user login'-block in a sidebar. The function drupal_get_destination()
* can be used to help set the destination URL.
*
- * It is advised to use drupal_goto() instead of PHP's header(), because
- * drupal_goto() will append the user's session ID to the URI when PHP is
- * compiled with "--enable-trans-sid".
+ * Drupal will ensure that messages set by drupal_set_message() and other
+ * session data are written to the database before the user is redirected.
*
* This function ends the request; use it rather than a print theme('page')
* statement in your menu callback.
@@ -302,9 +301,15 @@
}
$url = url($path, $query, $fragment, TRUE);
+ // Remove newlines from the URL to avoid header injection attacks.
+ $url = str_replace(array("\n", "\r"), '', $url);
// Before the redirect, allow modules to react to the end of the page request.
module_invoke_all('exit', $url);
+
+ // Even though session_write_close() is registered as a shutdown function, we
+ // need all session data written to the database before redirecting.
+ session_write_close();
header('Location: '. $url, TRUE, $http_response_code);
@@ -1511,6 +1516,8 @@
foreach ($type as $file => $cache) {
if ($cache) {
$contents = file_get_contents($file);
+ // Remove multiple charset declarations for standards compliance (and fixing Safari problems)
+ $contents = preg_replace('/^@charset\s+[\'"](\S*)\b[\'"];/i', '', $contents);
// Return the path to where this CSS file originated from, stripping off the name of the file at the end of the path.
$path = base_path() . substr($file, 0, strrpos($file, '/')) .'/';
// Wraps all @import arguments in url().
Modified: branches/upstream/current-5/includes/install.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/install.inc?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/includes/install.inc (original)
+++ branches/upstream/current-5/includes/install.inc Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: install.inc,v 1.31.2.1 2007/02/06 08:20:17 drumm Exp $
+// $Id: install.inc,v 1.31.2.2 2007/10/06 22:38:28 drumm Exp $
define('SCHEMA_UNINSTALLED', -1);
define('SCHEMA_INSTALLED', 0);
@@ -571,6 +571,7 @@
function install_goto($path) {
global $base_url;
header('Location: '. $base_url . '/' . $path);
+ header('Cache-Control: no-cache'); // Not a permanent redirect.
exit();
}
Modified: branches/upstream/current-5/install.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/install.php?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/install.php (original)
+++ branches/upstream/current-5/install.php Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: install.php,v 1.34.2.2 2007/07/12 06:53:03 drumm Exp $
+// $Id: install.php,v 1.34.2.3 2007/10/17 21:28:59 drumm Exp $
require_once './includes/install.inc';
@@ -165,6 +165,10 @@
// Don't fill in placeholders
if ($db_url == 'mysql://username:password@localhost/databasename') {
$db_user = $db_pass = $db_path = '';
+ }
+ elseif (!empty($db_url)) {
+ // Do not install over a configured settings.php.
+ install_already_done_error();
}
$output = drupal_get_form('install_settings_form', $profile, $install_locale, $settings_file, $db_url, $db_type, $db_prefix, $db_user, $db_pass, $db_host, $db_port, $db_path);
drupal_set_title(st('Database configuration'));
@@ -506,7 +510,7 @@
drupal_maintenance_theme();
drupal_set_title(st('Drupal already installed'));
- print theme('install_page', st('<ul><li>To start over, you must empty your existing database.</li><li>To install to a different database, edit the appropriate <em>settings.php</em> file in the <em>sites</em> folder.</li><li>To upgrade an existing installation, proceed to the <a href="@base-url/update.php">update script</a>.</li></ul>', array('@base-url' => $base_url)));
+ print theme('install_page', st('<ul><li>To start over, you must empty your existing database and replace the appropriate <em>settings.php</em> with an unmodified copy.</li><li>To install to a different database, edit the appropriate <em>settings.php</em> file in the <em>sites</em> folder.</li><li>To upgrade an existing installation, proceed to the <a href="@base-url/update.php">update script</a>.</li></ul>', array('@base-url' => $base_url)));
exit;
}
Modified: branches/upstream/current-5/misc/favicon.ico
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/misc/favicon.ico?rev=1823&op=diff
==============================================================================
Binary files - no diff available.
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-5/modules/aggregator/aggregator.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/block/block.info (original)
+++ branches/upstream/current-5/modules/block/block.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
Modified: branches/upstream/current-5/modules/block/block.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/block/block.module?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/block/block.module (original)
+++ branches/upstream/current-5/modules/block/block.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: block.module,v 1.246.2.5 2007/06/14 06:06:48 drumm Exp $
+// $Id: block.module,v 1.246.2.6 2007/09/12 07:49:35 drumm Exp $
/**
* @file
@@ -594,7 +594,9 @@
switch ($type) {
case 'form':
if ($category == 'account') {
- $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.status = 1 AND b.custom != 0 AND (r.rid IN (%s) OR r.rid IS NULL) ORDER BY b.weight, b.module", implode(',', array_keys($user->roles)));
+ $rids = array_keys($user->roles);
+ $placeholders = implode(',', array_fill(0, count($rids), '%d'));
+ $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.status = 1 AND b.custom != 0 AND (r.rid IN ($placeholders) OR r.rid IS NULL) ORDER BY b.weight, b.module", $rids);
$form['block'] = array('#type' => 'fieldset', '#title' => t('Block configuration'), '#weight' => 3, '#collapsible' => TRUE, '#tree' => TRUE);
while ($block = db_fetch_object($result)) {
$data = module_invoke($block->module, 'block', 'list');
@@ -641,7 +643,9 @@
static $blocks = array();
if (!count($blocks)) {
- $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.theme = '%s' AND b.status = 1 AND (r.rid IN (%s) OR r.rid IS NULL) ORDER BY b.region, b.weight, b.module", $theme_key, implode(',', array_keys($user->roles)));
+ $rids = array_keys($user->roles);
+ $placeholders = implode(',', array_fill(0, count($rids), '%d'));
+ $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.theme = '%s' AND b.status = 1 AND (r.rid IN ($placeholders) OR r.rid IS NULL) ORDER BY b.region, b.weight, b.module", array_merge(array($theme_key), $rids));
while ($block = db_fetch_object($result)) {
if (!isset($blocks[$block->region])) {
$blocks[$block->region] = array();
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blog/blog.info (original)
+++ branches/upstream/current-5/modules/blog/blog.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-5/modules/blogapi/blogapi.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/book/book.info (original)
+++ branches/upstream/current-5/modules/book/book.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/color/color.info (original)
+++ branches/upstream/current-5/modules/color/color.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
Modified: branches/upstream/current-5/modules/color/color.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/color/color.module?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/color/color.module (original)
+++ branches/upstream/current-5/modules/color/color.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,17 @@
<?php
-// $Id: color.module,v 1.13.2.2 2007/07/09 05:02:32 drumm Exp $
+// $Id: color.module,v 1.13.2.3 2007/10/16 07:02:40 drumm Exp $
+
+/**
+ * Implementation of hook_help
+ */
+function color_help($section) {
+ switch ($section) {
+ case 'admin/help#color':
+ $output = '<p>'. t('Color module allows a site administrator to quickly and easily change the color scheme of the entire site. In order for color module to work however, a theme must be specifically designed to use the color changing features. The default theme, Garland, (as well as its fixed width counterpart, Minnelli) was designed to take advantage of these features. With color module, you can easily change the color of links, backgrounds, text, and more depending on which color module enabled theme you are using. Color module requires your <a href="@url">file download method</a> to be set to public.', array('@url' => url('admin/settings/file-system'))) .'</p>';
+ $output .= '<p>'. t("It is important to remember that color module saves a modified copy of the theme's style.css file in the files directory, and includes it after the theme's original style.css. This means that if you make any manual changes to your theme's style.css file, you must save your color settings again, even if they haven't changed. This causes the color module generated version of style.css in the files directory to be recreated using the new version of the original file.") .'</p>';
+ return $output;
+ }
+}
/**
* Implementation of hook_form_alter().
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/comment/comment.info (original)
+++ branches/upstream/current-5/modules/comment/comment.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
Modified: branches/upstream/current-5/modules/comment/comment.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/comment/comment.module?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/comment/comment.module (original)
+++ branches/upstream/current-5/modules/comment/comment.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: comment.module,v 1.520.2.6 2007/07/26 19:16:45 drumm Exp $
+// $Id: comment.module,v 1.520.2.10 2007/10/17 21:29:00 drumm Exp $
/**
* @file
@@ -723,7 +723,7 @@
}
// Add the comment to database.
- $status = user_access('post comments without approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED;
+ $edit['status'] = user_access('post comments without approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED;
$roles = variable_get('comment_roles', array());
$score = 0;
@@ -784,7 +784,7 @@
$edit['name'] = $user->name;
}
- db_query("INSERT INTO {comments} (cid, nid, pid, uid, subject, comment, format, hostname, timestamp, status, score, users, thread, name, mail, homepage) VALUES (%d, %d, %d, %d, '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s')", $edit['cid'], $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], $edit['comment'], $edit['format'], $_SERVER['REMOTE_ADDR'], $edit['timestamp'], $status, $score, $users, $thread, $edit['name'], $edit['mail'], $edit['homepage']);
+ db_query("INSERT INTO {comments} (cid, nid, pid, uid, subject, comment, format, hostname, timestamp, status, score, users, thread, name, mail, homepage) VALUES (%d, %d, %d, %d, '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s')", $edit['cid'], $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], $edit['comment'], $edit['format'], $_SERVER['REMOTE_ADDR'], $edit['timestamp'], $edit['status'], $score, $users, $thread, $edit['name'], $edit['mail'], $edit['homepage']);
_comment_update_node_statistics($edit['nid']);
@@ -800,7 +800,7 @@
// Explain the approval queue if necessary, and then
// redirect the user to the node he's commenting on.
- if ($status == COMMENT_NOT_PUBLISHED) {
+ if ($edit['status'] == COMMENT_NOT_PUBLISHED) {
drupal_set_message(t('Your comment has been queued for moderation by site administrators and will be published after approval.'));
}
return $edit['cid'];
@@ -1055,8 +1055,9 @@
}
}
- // If enabled, show new comment form.
- if (user_access('post comments') && node_comment_mode($nid) == COMMENT_NODE_READ_WRITE && (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_BELOW)) {
+ // If enabled, show new comment form if it's not already being displayed.
+ $reply = arg(0) == 'comment' && arg(1) == 'reply';
+ if (user_access('post comments') && node_comment_mode($nid) == COMMENT_NODE_READ_WRITE && (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_BELOW) && !$reply) {
$output .= comment_form_box(array('nid' => $nid), t('Post new comment'));
}
@@ -1231,7 +1232,7 @@
}
cache_clear_all();
drupal_set_message(t('The update has been performed.'));
- drupal_goto('admin/content/comment');
+ return 'admin/content/comment';
}
}
@@ -1627,7 +1628,8 @@
$output .= theme('comment_view', $comment);
}
else {
- $form['#suffix'] = node_view(node_load($edit['nid']));
+ $suffix = empty($form['#suffix']) ? '' : $form['#suffix'];
+ $form['#suffix'] = $suffix . node_view(node_load($edit['nid']));
$edit['pid'] = 0;
}
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/contact/contact.info (original)
+++ branches/upstream/current-5/modules/contact/contact.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/drupal/drupal.info (original)
+++ branches/upstream/current-5/modules/drupal/drupal.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.info (original)
+++ branches/upstream/current-5/modules/filter/filter.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.module (original)
+++ branches/upstream/current-5/modules/filter/filter.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: filter.module,v 1.160.2.2 2007/06/05 07:29:14 drumm Exp $
+// $Id: filter.module,v 1.160.2.3 2007/08/08 06:54:10 drumm Exp $
/**
* @file
@@ -159,9 +159,9 @@
if ($allowed_html = variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>')) {
switch ($long) {
case 0:
- return t('Allowed HTML tags') .': '. check_plain($allowed_html);
+ return t('Allowed HTML tags: @tags', array('@tags' => $allowed_html));
case 1:
- $output = '<p>'. t('Allowed HTML tags') .': '. check_plain($allowed_html) .'</p>';
+ $output = '<p>'. t('Allowed HTML tags: @tags', array('@tags' => $allowed_html)) .'</p>';
if (!variable_get("filter_html_help_$format", 1)) {
return $output;
}
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/forum/forum.info (original)
+++ branches/upstream/current-5/modules/forum/forum.info Sat Oct 20 07:51:55 2007
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
Modified: branches/upstream/current-5/modules/forum/forum.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/forum/forum.module?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/forum/forum.module (original)
+++ branches/upstream/current-5/modules/forum/forum.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: forum.module,v 1.375.2.5 2007/05/31 05:58:17 drumm Exp $
+// $Id: forum.module,v 1.375.2.6 2007/08/08 06:27:22 drumm Exp $
/**
* @file
@@ -89,11 +89,6 @@
'type' => MENU_CALLBACK);
}
}
- else {
- // Add the CSS for this module
- // We put this in !$may_cache so it's only added once per request
- drupal_add_css(drupal_get_path('module', 'forum') .'/forum.css');
- }
return $items;
}
@@ -292,6 +287,7 @@
* Implementation of hook_view().
*/
function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
+ drupal_add_css(drupal_get_path('module', 'forum') .'/forum.css');
if ($page) {
$vocabulary = taxonomy_get_vocabulary(variable_get('forum_nav_vocabulary', ''));
// Breadcrumb navigation
@@ -847,6 +843,7 @@
* Menu callback; prints a forum listing.
*/
function forum_page($tid = 0) {
+ drupal_add_css(drupal_get_path('module', 'forum') .'/forum.css');
$forum_per_page = variable_get('forum_per_page', 25);
$sortby = variable_get('forum_order', 1);
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/help/help.info (original)
+++ branches/upstream/current-5/modules/help/help.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
Modified: branches/upstream/current-5/modules/help/help.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/help/help.module?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/help/help.module (original)
+++ branches/upstream/current-5/modules/help/help.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: help.module,v 1.69 2006/12/23 22:06:05 dries Exp $
+// $Id: help.module,v 1.69.2.1 2007/10/16 06:57:22 drumm Exp $
/**
* @file
@@ -126,9 +126,14 @@
$output .= $temp;
}
+ // Only print list of administration pages if the module in question has
+ // any such pages associated to it.
$admin_tasks = system_get_module_admin_tasks($name);
- ksort($admin_tasks);
- $output .= theme('item_list', $admin_tasks, t('@module administration pages', array('@module' => $module['name'])));
+ if (!empty($admin_tasks)) {
+ ksort($admin_tasks);
+ $output .= theme('item_list', $admin_tasks, t('@module administration pages', array('@module' => $module['name'])));
+ }
+
}
return $output;
}
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/legacy/legacy.info (original)
+++ branches/upstream/current-5/modules/legacy/legacy.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/locale/locale.info (original)
+++ branches/upstream/current-5/modules/locale/locale.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/menu/menu.info (original)
+++ branches/upstream/current-5/modules/menu/menu.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/node.info (original)
+++ branches/upstream/current-5/modules/node/node.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/node.module (original)
+++ branches/upstream/current-5/modules/node/node.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: node.module,v 1.776.2.19 2007/07/26 19:16:46 drumm Exp $
+// $Id: node.module,v 1.776.2.21 2007/09/29 23:41:28 drumm Exp $
/**
* @file
@@ -1312,42 +1312,48 @@
* Callback function for admin mass publishing nodes.
*/
function node_operations_publish($nodes) {
- db_query('UPDATE {node} SET status = 1 WHERE nid IN(%s)', implode(',', $nodes));
+ $placeholders = implode(',', array_fill(0, count($nodes), '%d'));
+ db_query('UPDATE {node} SET status = 1 WHERE nid IN('. $placeholders .')', $nodes);
}
/**
* Callback function for admin mass unpublishing nodes.
*/
function node_operations_unpublish($nodes) {
- db_query('UPDATE {node} SET status = 0 WHERE nid IN(%s)', implode(',', $nodes));
+ $placeholders = implode(',', array_fill(0, count($nodes), '%d'));
+ db_query('UPDATE {node} SET status = 0 WHERE nid IN('. $placeholders .')', $nodes);
}
/**
* Callback function for admin mass promoting nodes.
*/
function node_operations_promote($nodes) {
- db_query('UPDATE {node} SET status = 1, promote = 1 WHERE nid IN(%s)', implode(',', $nodes));
+ $placeholders = implode(',', array_fill(0, count($nodes), '%d'));
+ db_query('UPDATE {node} SET status = 1, promote = 1 WHERE nid IN('. $placeholders .')', $nodes);
}
/**
* Callback function for admin mass demoting nodes.
*/
function node_operations_demote($nodes) {
- db_query('UPDATE {node} SET promote = 0 WHERE nid IN(%s)', implode(',', $nodes));
+ $placeholders = implode(',', array_fill(0, count($nodes), '%d'));
+ db_query('UPDATE {node} SET promote = 0 WHERE nid IN('. $placeholders .')', $nodes);
}
/**
* Callback function for admin mass editing nodes to be sticky.
*/
function node_operations_sticky($nodes) {
- db_query('UPDATE {node} SET status = 1, sticky = 1 WHERE nid IN(%s)', implode(',', $nodes));
+ $placeholders = implode(',', array_fill(0, count($nodes), '%d'));
+ db_query('UPDATE {node} SET status = 1, sticky = 1 WHERE nid IN('. $placeholders .')', $nodes);
}
/**
* Callback function for admin mass editing nodes to remove stickiness.
*/
function node_operations_unsticky($nodes) {
- db_query('UPDATE {node} SET sticky = 0 WHERE nid IN(%s)', implode(',', $nodes));
+ $placeholders = implode(',', array_fill(0, count($nodes), '%d'));
+ db_query('UPDATE {node} SET sticky = 0 WHERE nid IN('. $placeholders .')', $nodes);
}
/**
@@ -2517,6 +2523,9 @@
// Build the node body.
$node = node_build_content($node, FALSE, FALSE);
$node->body = drupal_render($node->content);
+
+ // Allow modules to modify the fully-built node.
+ node_invoke_nodeapi($node, 'alter');
$text = '<h1>'. check_plain($node->title) .'</h1>'. $node->body;
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/path/path.info (original)
+++ branches/upstream/current-5/modules/path/path.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/ping/ping.info (original)
+++ branches/upstream/current-5/modules/ping/ping.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/poll/poll.info (original)
+++ branches/upstream/current-5/modules/poll/poll.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/poll/poll.module (original)
+++ branches/upstream/current-5/modules/poll/poll.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: poll.module,v 1.222.2.1 2007/07/26 19:16:48 drumm Exp $
+// $Id: poll.module,v 1.222.2.2 2007/10/07 00:21:18 drumm Exp $
/**
* @file
@@ -327,10 +327,12 @@
}
function poll_page() {
- // List all polls
+ // 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";
+ // 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);
- $result = pager_query($sql, 15);
+ $result = pager_query($sql, 15, 0, $count_sql);
$output = '<ul>';
while ($node = db_fetch_object($result)) {
$output .= '<li>'. l($node->title, "node/$node->nid") .' - '. format_plural($node->votes, '1 vote', '@count votes') .' - '. ($node->active ? t('open') : t('closed')) .'</li>';
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/profile/profile.info (original)
+++ branches/upstream/current-5/modules/profile/profile.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/search/search.info (original)
+++ branches/upstream/current-5/modules/search/search.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
Modified: branches/upstream/current-5/modules/search/search.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/search/search.install?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/search/search.install (original)
+++ branches/upstream/current-5/modules/search/search.install Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: search.install,v 1.6 2006/09/01 07:40:08 drumm Exp $
+// $Id: search.install,v 1.6.2.1 2007/09/30 01:13:23 drumm Exp $
/**
* Implementation of hook_install().
@@ -71,4 +71,5 @@
db_query('DROP TABLE {search_total}');
variable_del('minimum_word_size');
variable_del('overlap_cjk');
+ variable_del('search_cron_limit');
}
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/statistics/statistics.info (original)
+++ branches/upstream/current-5/modules/statistics/statistics.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.info (original)
+++ branches/upstream/current-5/modules/system/system.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.install (original)
+++ branches/upstream/current-5/modules/system/system.install Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: system.install,v 1.69.2.4 2007/07/19 05:39:25 drumm Exp $
+// $Id: system.install,v 1.69.2.6 2007/10/16 06:20:39 drumm Exp $
define('DRUPAL_MINIMUM_PHP', '4.3.3');
define('DRUPAL_MINIMUM_MYSQL', '3.23.17'); // If using MySQL
@@ -881,6 +881,8 @@
PRIMARY KEY (rid),
UNIQUE (name)
)");
+
+ db_query("SELECT setval('{role}_rid_seq',". max(DRUPAL_ANONYMOUS_RID,DRUPAL_AUTHENTICATED_RID) .")");
db_query("CREATE TABLE {blocks_roles} (
module varchar(64) NOT NULL,
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.module (original)
+++ branches/upstream/current-5/modules/system/system.module Sat Oct 20 07:51:55 2007
@@ -1,12 +1,12 @@
<?php
-// $Id: system.module,v 1.440.2.15 2007/07/26 19:16:48 drumm Exp $
+// $Id: system.module,v 1.440.2.19 2007/10/17 21:29:00 drumm Exp $
/**
* @file
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '5.2');
+define('VERSION', '5.3');
/**
* Implementation of hook_help().
@@ -16,7 +16,7 @@
switch ($section) {
case 'admin/help#system':
- $output = '<p>'. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency. The ability to run scheduled jobs makes administering the web site more usable, as administrators do not have to manually start jobs. The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve web site performance. The settings module provides control over preferences, behaviours including visual and operational settings.') .'</p>';
+ $output = '<p>'. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency. The ability to run scheduled jobs makes administering the web site more usable, as administrators do not have to manually start jobs. The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve web site performance. The system module provides control over preferences, behaviours including visual and operational settings.') .'</p>';
$output .= '<p>'. t('Some modules require regularly scheduled actions, such as cleaning up logfiles. Cron, which stands for chronograph, is a periodic command scheduler executing commands at intervals specified in seconds. It can be used to control the execution of daily, weekly and monthly jobs (or anything with a period measured in seconds). The aggregator module periodically updates feeds using cron. Ping periodically notifies services of new content on your site. Search periodically indexes the content on your site. Automating tasks is one of the best ways to keep a system running smoothly, and if most of your administration does not require your direct involvement, cron is an ideal solution. Cron can, if necessary, also be run manually.') .'</p>';
$output .= '<p>'. t("There is a caching mechanism which stores dynamically generated web pages in a database. By caching a web page, the system module does not have to create the page each time someone wants to view it, instead it takes only one SQL query to display it, reducing response time and the server's load. Only pages requested by <em>anonymous</em> users are cached. In order to reduce server load and save bandwidth, the system module stores and sends cached pages compressed.") .'</p>';
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@system">System page</a>.', array('@system' => 'http://drupal.org/handbook/modules/system/')) .'</p>';
@@ -658,7 +658,7 @@
sort($problem_modules);
if (count($problem_modules) > 0) {
- $description .= '<p>'. t('<strong class="error">The following enabled modules are incompatible with aggressive mode caching and will not function properly: %modules</strong>', array('%modules' => implode(', ', $problem_modules))) .'.</p>';
+ $description .= '<p>'. t('<strong class="error">The following enabled modules are incompatible with aggressive mode caching and might not function properly: %modules</strong>', array('%modules' => implode(', ', $problem_modules))) .'.</p>';
}
else {
$description .= '<p>'. t('<strong class="ok">Currently, all enabled modules are compatible with the aggressive caching policy.</strong> Please note, if you use aggressive caching and enable new modules, you will need to check this page again to ensure compatibility.') .'</p>';
@@ -2116,12 +2116,12 @@
* Output a confirmation form
*
* This function returns a complete form for confirming an action. A link is
- * offered to go back to the item that is being changed in case the user changes
- * his/her mind.
- *
- * You can check for the existence of $_POST[$name] (where $name
- * is usually 'confirm') to check if the confirmation was successful or
- * use the regular submit model.
+ * offered to go back to the item that is being changed in case the user
+ * changes his/her mind.
+ *
+ * If the submit handler for this form is invoked, the user successfully
+ * confirmed the action. You should never directly inspect $_POST to see if an
+ * action was confirmed.
*
* @param $form
* Additional elements to inject into the form, for example hidden elements.
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.module (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.module,v 1.330.2.10 2007/07/26 19:16:49 drumm Exp $
+// $Id: taxonomy.module,v 1.330.2.11 2007/09/12 07:49:36 drumm Exp $
/**
* @file
@@ -1369,7 +1369,8 @@
}
if ($terms['tids']) {
- $result = db_query(db_rewrite_sql('SELECT t.tid, t.name FROM {term_data} t WHERE t.tid IN (%s)', 't', 'tid'), implode(',', $terms['tids']));
+ $placeholders = implode(',', array_fill(0, count($terms['tids']), '%d'));
+ $result = db_query(db_rewrite_sql('SELECT t.tid, t.name FROM {term_data} t WHERE t.tid IN ('. $placeholders .')', 't', 'tid'), $terms['tids']);
$tids = array(); // we rebuild the $tids-array so it only contains terms the user has access to.
$names = array();
while ($term = db_fetch_object($result)) {
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/throttle/throttle.info (original)
+++ branches/upstream/current-5/modules/throttle/throttle.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/tracker/tracker.info (original)
+++ branches/upstream/current-5/modules/tracker/tracker.info Sat Oct 20 07:51:55 2007
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/upload/upload.info (original)
+++ branches/upstream/current-5/modules/upload/upload.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/upload/upload.module (original)
+++ branches/upstream/current-5/modules/upload/upload.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: upload.module,v 1.148.2.1 2007/03/07 03:27:24 drumm Exp $
+// $Id: upload.module,v 1.148.2.2 2007/10/17 21:29:00 drumm Exp $
/**
* @file
@@ -158,7 +158,7 @@
* Menu callback for the upload settings form.
*/
function upload_admin_settings() {
- $upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp');
+ $upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp');
$upload_uploadsize_default = variable_get('upload_uploadsize_default', 1);
$upload_usersize_default = variable_get('upload_usersize_default', 1);
@@ -421,7 +421,7 @@
$total_usersize = upload_space_used($user->uid) + $filesize;
$error = array();
foreach ($user->roles as $rid => $name) {
- $extensions = variable_get("upload_extensions_$rid", variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp'));
+ $extensions = variable_get("upload_extensions_$rid", variable_get('upload_extensions_default', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp'));
$uploadsize = variable_get("upload_uploadsize_$rid", variable_get('upload_uploadsize_default', 1)) * 1024 * 1024;
$usersize = variable_get("upload_usersize_$rid", variable_get('upload_usersize_default', 1)) * 1024 * 1024;
@@ -641,7 +641,7 @@
if (!isset($extensions)) {
$extensions = '';
foreach ($user->roles as $rid => $name) {
- $extensions .= ' '. variable_get("upload_extensions_$rid", variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp'));
+ $extensions .= ' '. variable_get("upload_extensions_$rid", variable_get('upload_extensions_default', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp'));
}
}
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.info (original)
+++ branches/upstream/current-5/modules/user/user.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.module (original)
+++ branches/upstream/current-5/modules/user/user.module Sat Oct 20 07:51:55 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.745.2.13 2007/07/26 19:16:50 drumm Exp $
+// $Id: user.module,v 1.745.2.20 2007/10/17 21:29:00 drumm Exp $
/**
* @file
@@ -156,7 +156,7 @@
// If the password changed, delete all open sessions and recreate
// the current one.
- if (isset($array['pass'])) {
+ if (!empty($array['pass'])) {
sess_destroy_uid($account->uid);
sess_regenerate();
}
@@ -365,8 +365,9 @@
// To reduce the number of SQL queries, we cache the user's permissions
// in a static variable.
if (!isset($perm[$account->uid])) {
- $result = db_query("SELECT DISTINCT(p.perm) FROM {role} r INNER JOIN {permission} p ON p.rid = r.rid WHERE r.rid IN (%s)", implode(',', array_keys($account->roles)));
-
+ $rids = array_keys($account->roles);
+ $placeholders = implode(',', array_fill(0, count($rids), '%d'));
+ $result = db_query("SELECT DISTINCT(p.perm) FROM {role} r INNER JOIN {permission} p ON p.rid = r.rid WHERE r.rid IN ($placeholders)", $rids);
$perm[$account->uid] = '';
while ($row = db_fetch_object($result)) {
$perm[$account->uid] .= "$row->perm, ";
@@ -1290,7 +1291,7 @@
drupal_mail('user-register-approval-user', $mail, $subject, $body, $from);
drupal_mail('user-register-approval-admin', $from, $subject, t("!username has applied for an account.\n\n!edit_uri", $variables), $from);
drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.<br />In the meantime, your password and further instructions have been sent to your e-mail address.'));
-
+ return '';
}
}
}
@@ -1414,16 +1415,11 @@
drupal_set_message(t('The account does not exist or has already been deleted.'));
drupal_goto('admin/user/user');
}
+
$edit = $_POST['op'] ? $_POST : (array)$account;
if (arg(2) == 'delete') {
- if (!empty($edit['confirm'])) {
- user_delete($edit, $account->uid);
- drupal_goto('admin/user/user');
- }
- else {
- return drupal_get_form('user_confirm_delete', $account->name, $account->uid);
- }
+ return drupal_get_form('user_confirm_delete', $account->name, $account->uid);
}
else if ($_POST['op'] == t('Delete')) {
if ($_REQUEST['destination']) {
@@ -1448,11 +1444,18 @@
}
function user_confirm_delete($name, $uid) {
- return confirm_form(array(),
+ $form['uid'] = array('#type' => 'value', '#value' => $uid);
+ return confirm_form($form,
t('Are you sure you want to delete the account %name?', array('%name' => $name)),
'user/'. $uid,
t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'),
t('Delete'), t('Cancel'));
+}
+
+function user_confirm_delete_submit($form_id, $form_values) {
+ $account = user_load(array('uid' => $form_values['uid']));
+ user_delete((array) $account, $form_values['uid']);
+ return 'admin/user/user';
}
/**
@@ -2554,10 +2557,15 @@
);
foreach ($session as $filter) {
list($type, $value) = $filter;
- $string = ($i++ ? '<em>and</em> where <strong>%a</strong> is <strong>%b</strong>' : '<strong>%a</strong> is <strong>%b</strong>');
// Merge an array of arrays into one if necessary.
$options = $type == 'permission' ? call_user_func_array('array_merge', $filters[$type]['options']) : $filters[$type]['options'];
- $form['filters']['current'][] = array('#value' => t($string, array('%a' => $filters[$type]['title'] , '%b' => $options[$value])));
+ $params = array('%property' => $filters[$type]['title'] , '%value' => $options[$value]);
+ if ($i++ > 0) {
+ $form['filters']['current'][] = array('#value' => t('<em>and</em> where <strong>%property</strong> is <strong>%value</strong>', $params));
+ }
+ else {
+ $form['filters']['current'][] = array('#value' => t('<strong>%property</strong> is <strong>%value</strong>', $params));
+ }
}
foreach ($filters as $key => $filter) {
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=1823&op=diff
==============================================================================
--- branches/upstream/current-5/modules/watchdog/watchdog.info (original)
+++ branches/upstream/current-5/modules/watchdog/watchdog.info Sat Oct 20 07:51:55 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-07-26
-version = "5.2"
+; Information added by drupal.org packaging script on 2007-10-17
+version = "5.3"
project = "drupal"
-datestamp = "1185477907"
+datestamp = "1192656904"
Modified: branches/upstream/current-5/themes/chameleon/common.css
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/themes/chameleon/common.css?rev=1823&op=diff
==============================================================================
--- branches/upstream/current-5/themes/chameleon/common.css (original)
+++ branches/upstream/current-5/themes/chameleon/common.css Sat Oct 20 07:51:55 2007
@@ -1,4 +1,4 @@
-/* $Id: common.css,v 1.11 2006/08/30 07:37:14 drumm Exp $ */
+/* $Id: common.css,v 1.11.2.1 2007/09/13 18:59:59 drumm Exp $ */
/*
** HTML elements
@@ -82,6 +82,7 @@
font-size: 0.8em;
padding-top: 2em;
text-align: center;
+ clear: both;
}
/*
More information about the Pkg-drupal-commits
mailing list