[Pkg-drupal-commits] r1836 - 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 Dec 7 20:28:45 UTC 2007
Author: luigi
Date: Fri Dec 7 20:28:44 2007
New Revision: 1836
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1836
Log:
[svn-upgrade] Integrating new upstream version, drupal5 (5.5)
Modified:
branches/upstream/current-5/CHANGELOG.txt
branches/upstream/current-5/includes/bootstrap.inc
branches/upstream/current-5/includes/database.inc
branches/upstream/current-5/includes/database.mysql.inc
branches/upstream/current-5/includes/database.mysqli.inc
branches/upstream/current-5/includes/database.pgsql.inc
branches/upstream/current-5/includes/form.inc
branches/upstream/current-5/install.php
branches/upstream/current-5/modules/aggregator/aggregator.info
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/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/forum/forum.info
branches/upstream/current-5/modules/help/help.info
branches/upstream/current-5/modules/legacy/legacy.info
branches/upstream/current-5/modules/legacy/legacy.module
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/path/path.info
branches/upstream/current-5/modules/ping/ping.info
branches/upstream/current-5/modules/poll/poll.info
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/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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/CHANGELOG.txt (original)
+++ branches/upstream/current-5/CHANGELOG.txt Fri Dec 7 20:28:44 2007
@@ -1,4 +1,14 @@
-// $Id: CHANGELOG.txt,v 1.173.2.10 2007/10/17 21:28:59 drumm Exp $
+// $Id: CHANGELOG.txt,v 1.173.2.15 2007/12/06 20:23:24 drumm Exp $
+
+Drupal 5.5, 2007-12-06
+----------------------
+- fixed missing missing brackets in a query in the user module.
+- fixed taxonomy feed bug introduced by SA-2007-031
+
+Drupal 5.4, 2007-12-05
+----------------------
+- fixed a variety of small bugs.
+- fixed a security issue (SQL injection), see SA-2007-031
Drupal 5.3, 2007-10-17
----------------------
@@ -98,6 +108,14 @@
* added nested lists generation.
* added a self-clearing block class.
+Drupal 4.7.10, 2007-12-06
+-------------------------
+- fixed taxonomy feed bug introduced by SA-2007-031
+
+Drupal 4.7.9, 2007-12-05
+------------------------
+- fixed a security issue (SQL injection), see SA-2007-031
+
Drupal 4.7.8, 2007-10-17
------------------------
- fixed a security issue (HTTP response splitting), see SA-2007-024
Modified: branches/upstream/current-5/includes/bootstrap.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/bootstrap.inc?rev=1836&op=diff
==============================================================================
--- branches/upstream/current-5/includes/bootstrap.inc (original)
+++ branches/upstream/current-5/includes/bootstrap.inc Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: bootstrap.inc,v 1.145.2.6 2007/07/26 19:16:45 drumm Exp $
+// $Id: bootstrap.inc,v 1.145.2.7 2007/10/28 04:53:14 drumm Exp $
/**
* @file
@@ -818,11 +818,9 @@
function drupal_bootstrap($phase) {
static $phases = array(DRUPAL_BOOTSTRAP_CONFIGURATION, DRUPAL_BOOTSTRAP_EARLY_PAGE_CACHE, DRUPAL_BOOTSTRAP_DATABASE, DRUPAL_BOOTSTRAP_ACCESS, DRUPAL_BOOTSTRAP_SESSION, DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE, DRUPAL_BOOTSTRAP_PATH, DRUPAL_BOOTSTRAP_FULL);
- while (!is_null($current_phase = array_shift($phases))) {
+ while (!empty($phases) && $phase >= $phases[0]) {
+ $current_phase = array_shift($phases);
_drupal_bootstrap($current_phase);
- if ($phase == $current_phase) {
- return;
- }
}
}
Modified: branches/upstream/current-5/includes/database.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/database.inc?rev=1836&op=diff
==============================================================================
--- branches/upstream/current-5/includes/database.inc (original)
+++ branches/upstream/current-5/includes/database.inc Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: database.inc,v 1.62.2.4 2007/07/12 06:25:47 drumm Exp $
+// $Id: database.inc,v 1.62.2.5 2007/11/07 05:55:46 drumm Exp $
/**
* @file
@@ -252,7 +252,7 @@
* @param $query
* Query to be rewritten.
* @param $primary_table
- * Name or alias of the table which has the primary key field for this query. Possible values are: comments, forum, node, menu, term_data, vocabulary.
+ * Name or alias of the table which has the primary key field for this query. Possible values are: {comments}, {forum}, {node}, {menu}, {term_data}, {vocabulary}.
* @param $primary_field
* Name of the primary field.
* @param $args
Modified: branches/upstream/current-5/includes/database.mysql.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/database.mysql.inc?rev=1836&op=diff
==============================================================================
--- branches/upstream/current-5/includes/database.mysql.inc (original)
+++ branches/upstream/current-5/includes/database.mysql.inc Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: database.mysql.inc,v 1.66.2.1 2007/01/22 02:20:50 unconed Exp $
+// $Id: database.mysql.inc,v 1.66.2.2 2007/10/19 21:49:26 drumm Exp $
/**
* @file
@@ -105,7 +105,7 @@
drupal_set_header('HTTP/1.1 503 Service Unavailable');
drupal_set_title('Unable to connect to database server');
print theme('maintenance_page', '<p>If you still have to install Drupal, proceed to the <a href="'. base_path() .'install.php">installation page</a>.</p>
-<p>If you have already finished installed Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the MySQL database server. This could mean your hosting provider\'s database server is down.</p>
+<p>If you have already finished installing Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the MySQL database server. This could mean your hosting provider\'s database server is down.</p>
<p>The MySQL error was: '. theme('placeholder', mysql_error()) .'.</p>
<p>Currently, the username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
<ul>
Modified: branches/upstream/current-5/includes/database.mysqli.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/database.mysqli.inc?rev=1836&op=diff
==============================================================================
--- branches/upstream/current-5/includes/database.mysqli.inc (original)
+++ branches/upstream/current-5/includes/database.mysqli.inc Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: database.mysqli.inc,v 1.32 2006/12/27 22:50:09 dries Exp $
+// $Id: database.mysqli.inc,v 1.32.2.1 2007/10/19 21:49:26 drumm Exp $
/**
* @file
@@ -85,7 +85,7 @@
drupal_set_header('HTTP/1.1 503 Service Unavailable');
drupal_set_title('Unable to connect to database server');
print theme('maintenance_page', '<p>If you still have to install Drupal, proceed to the <a href="'. base_path() .'install.php">installation page</a>.</p>
-<p>If you have already finished installed Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the MySQL database server. This could mean your hosting provider\'s database server is down.</p>
+<p>If you have already finished installing Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the MySQL database server. This could mean your hosting provider\'s database server is down.</p>
<p>The MySQL error was: '. theme('placeholder', mysqli_error($connection)) .'.</p>
<p>Currently, the username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
<ul>
Modified: branches/upstream/current-5/includes/database.pgsql.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/database.pgsql.inc?rev=1836&op=diff
==============================================================================
--- branches/upstream/current-5/includes/database.pgsql.inc (original)
+++ branches/upstream/current-5/includes/database.pgsql.inc Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: database.pgsql.inc,v 1.43 2006/12/27 22:13:56 dries Exp $
+// $Id: database.pgsql.inc,v 1.43.2.1 2007/10/19 21:49:26 drumm Exp $
/**
* @file
@@ -92,7 +92,7 @@
drupal_set_header('HTTP/1.1 503 Service Unavailable');
drupal_set_title('Unable to connect to database');
print theme('maintenance_page', '<p>If you still have to install Drupal, proceed to the <a href="'. base_path() .'install.php">installation page</a>.</p>
-<p>If you have already finished installed Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the PostgreSQL database server. This could mean your hosting provider\'s database server is down.</p>
+<p>If you have already finished installing Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or that we can\'t connect to the PostgreSQL database server. This could mean your hosting provider\'s database server is down.</p>
<p>The PostgreSQL error was: '. theme('placeholder', decode_entities($php_errormsg)) .'</p>
<p>Currently, the database is '. theme('placeholder', substr($url['path'], 1)) .', the username is '. theme('placeholder', $url['user']) .', and the database server is '. theme('placeholder', $url['host']) .'.</p>
<ul>
Modified: branches/upstream/current-5/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/form.inc?rev=1836&op=diff
==============================================================================
--- branches/upstream/current-5/includes/form.inc (original)
+++ branches/upstream/current-5/includes/form.inc Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.174.2.11 2007/07/26 19:16:45 drumm Exp $
+// $Id: form.inc,v 1.174.2.12 2007/11/10 02:24:47 drumm Exp $
/**
* @defgroup form Form generation
@@ -13,17 +13,18 @@
* The drupal_get_form() function handles retrieving, processing, and
* displaying a rendered HTML form for modules automatically. For example:
*
+ * @code
* // Display the user registration form.
* $output = drupal_get_form('user_register');
+ * @endcode
*
* Forms can also be built and submitted programmatically without any user input
* using the drupal_execute() function.
*
- *
* For information on the format of the structured arrays used to define forms,
* and more detailed explanations of the Form API workflow, see the
- * @link http://api.drupal.org/api/HEAD/file/developer/topics/forms_api_reference.html reference @endlink
- * and the @link http://api.drupal.org/api/HEAD/file/developer/topics/forms_api.html quickstart guide. @endlink
+ * @link http://api.drupal.org/api/file/developer/topics/forms_api_reference.html/5 reference @endlink
+ * and the @link http://api.drupal.org/api/file/developer/topics/forms_api.html/5 quickstart guide. @endlink
*/
/**
Modified: branches/upstream/current-5/install.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/install.php?rev=1836&op=diff
==============================================================================
--- branches/upstream/current-5/install.php (original)
+++ branches/upstream/current-5/install.php Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: install.php,v 1.34.2.3 2007/10/17 21:28:59 drumm Exp $
+// $Id: install.php,v 1.34.2.4 2007/11/07 08:10:16 drumm Exp $
require_once './includes/install.inc';
@@ -15,9 +15,10 @@
* The installation phase we should proceed to.
*/
function install_main() {
- global $profile, $install_locale;
require_once './includes/bootstrap.inc';
drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
+ // This must go after drupal_bootstrap(), which unsets globals!
+ global $profile, $install_locale;
require_once './modules/system/system.install';
require_once './includes/file.inc';
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-5/modules/aggregator/aggregator.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/block/block.info (original)
+++ branches/upstream/current-5/modules/block/block.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blog/blog.info (original)
+++ branches/upstream/current-5/modules/blog/blog.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-5/modules/blogapi/blogapi.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/book/book.info (original)
+++ branches/upstream/current-5/modules/book/book.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/color/color.info (original)
+++ branches/upstream/current-5/modules/color/color.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/color/color.module (original)
+++ branches/upstream/current-5/modules/color/color.module Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: color.module,v 1.13.2.3 2007/10/16 07:02:40 drumm Exp $
+// $Id: color.module,v 1.13.2.4 2007/11/12 03:38:08 drumm Exp $
/**
* Implementation of hook_help
@@ -385,7 +385,7 @@
// Render gradient.
for ($y = 0; $y < $info['gradient'][3]; ++$y) {
$color = _color_blend($target, $palette['top'], $palette['bottom'], $y / ($info['gradient'][3] - 1));
- imagefilledrectangle($target, $info['gradient'][0], $info['gradient'][1] + $y, $info['gradient'][2], $info['gradient'][1] + $y + 1, $color);
+ imagefilledrectangle($target, $info['gradient'][0], $info['gradient'][1] + $y, $info['gradient'][0] + $info['gradient'][2], $info['gradient'][1] + $y + 1, $color);
}
// Blend over template.
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/comment/comment.info (original)
+++ branches/upstream/current-5/modules/comment/comment.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/comment/comment.module (original)
+++ branches/upstream/current-5/modules/comment/comment.module Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: comment.module,v 1.520.2.10 2007/10/17 21:29:00 drumm Exp $
+// $Id: comment.module,v 1.520.2.12 2007/11/07 08:03:30 drumm Exp $
/**
* @file
@@ -260,7 +260,7 @@
if (!empty($nids)) {
// From among the comments on the nodes selected in the first query,
// find the $number most recent comments.
- $result = db_query_range('SELECT c.nid, c.subject, c.cid, c.timestamp FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE c.nid IN ('. implode(',', $nids) .') AND n.status = 1 AND c.status = %d ORDER BY c.timestamp DESC', COMMENT_PUBLISHED, 0, $number);
+ $result = db_query_range('SELECT c.nid, c.subject, c.cid, c.timestamp FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE c.nid IN ('. implode(',', $nids) .') AND n.status = 1 AND c.status = %d ORDER BY c.cid DESC', COMMENT_PUBLISHED, 0, $number);
while ($comment = db_fetch_object($result)) {
$comments[] = $comment;
}
@@ -981,7 +981,7 @@
if ($order == COMMENT_ORDER_NEWEST_FIRST) {
if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) {
- $query .= ' ORDER BY c.timestamp DESC';
+ $query .= ' ORDER BY c.cid DESC';
}
else {
$query .= ' ORDER BY c.thread DESC';
@@ -989,7 +989,7 @@
}
else if ($order == COMMENT_ORDER_OLDEST_FIRST) {
if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) {
- $query .= ' ORDER BY c.timestamp';
+ $query .= ' ORDER BY c.cid';
}
else {
@@ -1566,10 +1566,6 @@
$form['#after_build'] = array('comment_form_add_preview');
}
- if ($_REQUEST['destination']) {
- $form['#attributes']['destination'] = $_REQUEST['destination'];
- }
-
if (empty($edit['cid']) && empty($edit['pid'])) {
$form['#action'] = url('comment/reply/'. $edit['nid']);
}
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/contact/contact.info (original)
+++ branches/upstream/current-5/modules/contact/contact.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/drupal/drupal.info (original)
+++ branches/upstream/current-5/modules/drupal/drupal.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.info (original)
+++ branches/upstream/current-5/modules/filter/filter.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/forum/forum.info (original)
+++ branches/upstream/current-5/modules/forum/forum.info Fri Dec 7 20:28:44 2007
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/help/help.info (original)
+++ branches/upstream/current-5/modules/help/help.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/legacy/legacy.info (original)
+++ branches/upstream/current-5/modules/legacy/legacy.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
Modified: branches/upstream/current-5/modules/legacy/legacy.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/legacy/legacy.module?rev=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/legacy/legacy.module (original)
+++ branches/upstream/current-5/modules/legacy/legacy.module Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: legacy.module,v 1.15 2006/11/21 20:14:18 dries Exp $
+// $Id: legacy.module,v 1.15.2.1 2007/11/10 03:27:33 drumm Exp $
/**
* @file
@@ -57,19 +57,19 @@
// Map "node/view/52" to "node/52".
$items[] = array('path' => 'node/view', 'title' => t('View'),
'callback' => 'drupal_goto',
- 'callback arguments' => array('node/'. arg(2), NULL, NULL),
+ 'callback arguments' => array('node/'. arg(2), NULL, NULL, 301),
'access' => TRUE, 'type' => MENU_CALLBACK);
// Map "book/view/52" to "node/52".
$items[] = array('path' => 'book/view', 'title' => t('View'),
'callback' => 'drupal_goto',
- 'callback arguments' => array('node/'. arg(2), NULL, NULL),
+ 'callback arguments' => array('node/'. arg(2), NULL, NULL, 301),
'access' => TRUE, 'type' => MENU_CALLBACK);
// Map "user/view/52" to "user/52".
$items[] = array('path' => 'user/view', 'title' => t('View'),
'callback' => 'drupal_goto',
- 'callback arguments' => array('user/'. arg(2), NULL, NULL),
+ 'callback arguments' => array('user/'. arg(2), NULL, NULL, 301),
'access' => TRUE, 'type' => MENU_CALLBACK);
}
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/locale/locale.info (original)
+++ branches/upstream/current-5/modules/locale/locale.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/menu/menu.info (original)
+++ branches/upstream/current-5/modules/menu/menu.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/node.info (original)
+++ branches/upstream/current-5/modules/node/node.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/path/path.info (original)
+++ branches/upstream/current-5/modules/path/path.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/ping/ping.info (original)
+++ branches/upstream/current-5/modules/ping/ping.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/poll/poll.info (original)
+++ branches/upstream/current-5/modules/poll/poll.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/profile/profile.info (original)
+++ branches/upstream/current-5/modules/profile/profile.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/search/search.info (original)
+++ branches/upstream/current-5/modules/search/search.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/statistics/statistics.info (original)
+++ branches/upstream/current-5/modules/statistics/statistics.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.info (original)
+++ branches/upstream/current-5/modules/system/system.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.install (original)
+++ branches/upstream/current-5/modules/system/system.install Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: system.install,v 1.69.2.6 2007/10/16 06:20:39 drumm Exp $
+// $Id: system.install,v 1.69.2.8 2007/11/07 05:53:24 drumm Exp $
define('DRUPAL_MINIMUM_PHP', '4.3.3');
define('DRUPAL_MINIMUM_MYSQL', '3.23.17'); // If using MySQL
@@ -1385,7 +1385,7 @@
list(, $page, $op, $uid) = explode('/', $alias->src);
if ($page == 'feed') {
$new = "blog/$uid/feed";
- update_sql("UPDATE {url_alias} SET src = '%s' WHERE pid = '%s'", $new, $alias->pid);
+ db_query("UPDATE {url_alias} SET src = '%s' WHERE pid = %d", $new, $alias->pid);
}
}
@@ -3029,7 +3029,7 @@
switch ($GLOBALS['db_type']) {
case 'mysql':
case 'mysqli':
- $ret[] = update_sql("ALTER TABLE {profile_fields} ADD autocomplete TINYint NOT NULL AFTER visibility ;");
+ $ret[] = update_sql("ALTER TABLE {profile_fields} ADD autocomplete TINYint NOT NULL AFTER visibility");
break;
case 'pgsql':
db_add_column($ret, 'profile_fields', 'autocomplete', 'smallint', array('not null' => TRUE, 'default' => 0));
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.module (original)
+++ branches/upstream/current-5/modules/system/system.module Fri Dec 7 20:28:44 2007
@@ -1,12 +1,12 @@
<?php
-// $Id: system.module,v 1.440.2.19 2007/10/17 21:29:00 drumm Exp $
+// $Id: system.module,v 1.440.2.23 2007/12/06 20:23:24 drumm Exp $
/**
* @file
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '5.3');
+define('VERSION', '5.5');
/**
* Implementation of hook_help().
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.module (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.module Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.module,v 1.330.2.11 2007/09/12 07:49:36 drumm Exp $
+// $Id: taxonomy.module,v 1.330.2.14 2007/12/06 18:16:38 drumm Exp $
/**
* @file
@@ -622,11 +622,10 @@
function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
$vocabulary = taxonomy_get_vocabulary($vid);
$help = ($help) ? $help : $vocabulary->help;
- if ($vocabulary->required) {
- $blank = 0;
- }
- else {
- $blank = '<'. t('none') .'>';
+ $blank = 0;
+
+ if (!$vocabulary->multiple) {
+ $blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -');
}
return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank);
@@ -1181,7 +1180,7 @@
$options = array();
if ($blank) {
- $options[0] = $blank;
+ $options[''] = $blank;
}
if ($tree) {
foreach ($tree as $term) {
@@ -1190,10 +1189,6 @@
$choice->option = array($term->tid => str_repeat('-', $term->depth) . $term->name);
$options[] = $choice;
}
- }
- if (!$blank && !$value) {
- // required but without a predefined value, so set first as predefined
- $value = $tree[0]->tid;
}
}
@@ -1248,16 +1243,20 @@
}
if ($operator == 'or') {
- $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));
- $sql = 'SELECT DISTINCT(n.nid), n.sticky, n.title, n.created FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid WHERE tn.tid IN ('. $str_tids .') AND n.status = 1 ORDER BY '. $order;
- $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid WHERE tn.tid IN ('. $str_tids .') AND n.status = 1';
+ $args = call_user_func_array('array_merge', $descendant_tids);
+ $placeholders = implode(',', array_fill(0, count($args), '%d'));
+ $sql = 'SELECT DISTINCT(n.nid), n.sticky, n.title, n.created FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid WHERE tn.tid IN ('. $placeholders .') AND n.status = 1 ORDER BY '. $order;
+ $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid WHERE tn.tid IN ('. $placeholders .') AND n.status = 1';
}
else {
$joins = '';
$wheres = '';
+ $args = array();
foreach ($descendant_tids as $index => $tids) {
$joins .= ' INNER JOIN {term_node} tn'. $index .' ON n.nid = tn'. $index .'.nid';
- $wheres .= ' AND tn'. $index .'.tid IN ('. implode(',', $tids) .')';
+ $placeholders = implode(',', array_fill(0, count($tids), '%d'));
+ $wheres .= ' AND tn'. $index .'.tid IN ('. $placeholders .')';
+ $args = array_merge($args, $tids);
}
$sql = 'SELECT DISTINCT(n.nid), n.sticky, n.title, n.created FROM {node} n '. $joins .' WHERE n.status = 1 '. $wheres .' ORDER BY '. $order;
$sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n '. $joins .' WHERE n.status = 1 '. $wheres;
@@ -1265,10 +1264,10 @@
$sql = db_rewrite_sql($sql);
$sql_count = db_rewrite_sql($sql_count);
if ($pager) {
- $result = pager_query($sql, variable_get('default_nodes_main', 10), 0, $sql_count);
+ $result = pager_query($sql, variable_get('default_nodes_main', 10), 0, $sql_count, $args);
}
else {
- $result = db_query_range($sql, 0, variable_get('feed_default_items', 10));
+ $result = db_query_range($sql, $args, 0, variable_get('feed_default_items', 10));
}
}
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/throttle/throttle.info (original)
+++ branches/upstream/current-5/modules/throttle/throttle.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/tracker/tracker.info (original)
+++ branches/upstream/current-5/modules/tracker/tracker.info Fri Dec 7 20:28:44 2007
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/upload/upload.info (original)
+++ branches/upstream/current-5/modules/upload/upload.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.info (original)
+++ branches/upstream/current-5/modules/user/user.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.module (original)
+++ branches/upstream/current-5/modules/user/user.module Fri Dec 7 20:28:44 2007
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.745.2.20 2007/10/17 21:29:00 drumm Exp $
+// $Id: user.module,v 1.745.2.23 2007/12/06 19:49:14 drumm Exp $
/**
* @file
@@ -111,6 +111,11 @@
user_module_invoke('update', $array, $account, $category);
$data = unserialize(db_result(db_query('SELECT data FROM {users} WHERE uid = %d', $account->uid)));
+ // Consider users edited by an administrator as logged in, if they haven't
+ // already, so anonymous users can view the profile (if allowed).
+ if (empty($array['access']) && empty($account->access) && user_access('administer users')) {
+ $array['access'] = time();
+ }
foreach ($array as $key => $value) {
if ($key == 'pass' && !empty($value)) {
$query .= "$key = '%s', ";
@@ -170,6 +175,11 @@
if (!isset($array['created'])) { // Allow 'created' to be set by hook_auth
$array['created'] = time();
+ }
+ // Consider users created by an administrator as already logged in, so
+ // anonymous users can view the profile (if allowed).
+ if (empty($array['access']) && user_access('administer users')) {
+ $array['access'] = time();
}
// Note, we wait with saving the data column to prevent module-handled
@@ -2017,7 +2027,8 @@
$sql = 'SELECT DISTINCT u.uid, u.name, u.status, u.created, u.access FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid '. $filter['join'] .' WHERE u.uid != 0 '. $filter['where'];
$sql .= tablesort_sql($header);
- $result = pager_query($sql, 50, 0, NULL, $filter['args']);
+ $query_count = 'SELECT COUNT(DISTINCT u.uid) FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid '. $filter['join'] .' WHERE u.uid != 0 '. $filter['where'];
+ $result = pager_query($sql, 50, 0, $query_count, $filter['args']);
$form['options'] = array(
'#type' => 'fieldset',
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=1836&op=diff
==============================================================================
--- branches/upstream/current-5/modules/watchdog/watchdog.info (original)
+++ branches/upstream/current-5/modules/watchdog/watchdog.info Fri Dec 7 20:28:44 2007
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2007-10-17
-version = "5.3"
+; Information added by drupal.org packaging script on 2007-12-06
+version = "5.5"
project = "drupal"
-datestamp = "1192656904"
+datestamp = "1196973009"
More information about the Pkg-drupal-commits
mailing list