[Pkg-drupal-commits] r1891 - 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
Thu Jul 17 13:34:45 UTC 2008
Author: luigi
Date: Thu Jul 17 13:34:44 2008
New Revision: 1891
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1891
Log:
[svn-upgrade] Integrating new upstream version, drupal5 (5.8)
Modified:
branches/upstream/current-5/CHANGELOG.txt
branches/upstream/current-5/includes/cache.inc
branches/upstream/current-5/includes/common.inc
branches/upstream/current-5/includes/database.mysqli.inc
branches/upstream/current-5/includes/file.inc
branches/upstream/current-5/includes/menu.inc
branches/upstream/current-5/includes/theme.inc
branches/upstream/current-5/includes/xmlrpc.inc
branches/upstream/current-5/includes/xmlrpcs.inc
branches/upstream/current-5/install.php
branches/upstream/current-5/modules/aggregator/aggregator.info
branches/upstream/current-5/modules/aggregator/aggregator.module
branches/upstream/current-5/modules/block/block.info
branches/upstream/current-5/modules/block/block.module
branches/upstream/current-5/modules/blog/blog.info
branches/upstream/current-5/modules/blog/blog.module
branches/upstream/current-5/modules/blogapi/blogapi.info
branches/upstream/current-5/modules/blogapi/blogapi.module
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/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.install
branches/upstream/current-5/modules/forum/forum.module
branches/upstream/current-5/modules/help/help.info
branches/upstream/current-5/modules/legacy/legacy.info
branches/upstream/current-5/modules/locale/locale.info
branches/upstream/current-5/modules/locale/locale.module
branches/upstream/current-5/modules/menu/menu.info
branches/upstream/current-5/modules/node/content_types.inc
branches/upstream/current-5/modules/node/node.info
branches/upstream/current-5/modules/node/node.module
branches/upstream/current-5/modules/path/path.info
branches/upstream/current-5/modules/path/path.module
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/profile/profile.module
branches/upstream/current-5/modules/search/search.info
branches/upstream/current-5/modules/search/search.module
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/robots.txt
Modified: branches/upstream/current-5/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/CHANGELOG.txt?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/CHANGELOG.txt (original)
+++ branches/upstream/current-5/CHANGELOG.txt Thu Jul 17 13:34:44 2008
@@ -1,4 +1,9 @@
-// $Id: CHANGELOG.txt,v 1.173.2.19 2008/01/29 00:00:44 drumm Exp $
+// $Id: CHANGELOG.txt,v 1.173.2.21 2008/07/09 21:48:41 drumm Exp $
+
+Drupal 5.8, 2008-07-09
+----------------------
+- fixed a variety of small bugs.
+- fixed security issues, (Cross site scripting, cross site request forgery, and session fixation), see SA-2008-044
Drupal 5.7, 2008-01-28
----------------------
Modified: branches/upstream/current-5/includes/cache.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/cache.inc?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/includes/cache.inc (original)
+++ branches/upstream/current-5/includes/cache.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: cache.inc,v 1.5.2.4 2007/06/27 03:35:48 drumm Exp $
+// $Id: cache.inc,v 1.5.2.5 2008/02/10 02:05:00 drumm Exp $
/**
* Return data from the persistent cache.
@@ -16,9 +16,10 @@
// Garbage collection necessary when enforcing a minimum cache lifetime
$cache_flush = variable_get('cache_flush', 0);
if ($cache_flush && ($cache_flush + variable_get('cache_lifetime', 0) <= time())) {
+ // Reset the variable immediately to prevent a meltdown in heavy load situations.
+ variable_set('cache_flush', 0);
// Time to flush old cache data
db_query("DELETE FROM {". $table ."} WHERE expire != %d AND expire <= %d", CACHE_PERMANENT, $cache_flush);
- variable_set('cache_flush', 0);
}
$cache = db_fetch_object(db_query("SELECT data, created, headers, expire FROM {". $table ."} WHERE cid = '%s'", $key));
Modified: branches/upstream/current-5/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/common.inc?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/includes/common.inc (original)
+++ branches/upstream/current-5/includes/common.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.611.2.15 2008/01/22 09:36:49 drumm Exp $
+// $Id: common.inc,v 1.611.2.20 2008/07/09 19:34:30 drumm Exp $
/**
* @file
@@ -352,8 +352,10 @@
menu_set_active_item('');
}
- if (empty($return)) {
+ if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
drupal_set_title(t('Page not found'));
+ menu_set_active_item('');
+ $return = '';
}
// To conserve CPU and bandwidth, omit the blocks
print theme('page', $return, FALSE);
@@ -366,7 +368,7 @@
drupal_set_header('HTTP/1.1 403 Forbidden');
watchdog('access denied', check_plain($_GET['q']), WATCHDOG_WARNING);
-// Keep old path for reference
+ // Keep old path for reference
if (!isset($_REQUEST['destination'])) {
$_REQUEST['destination'] = $_GET['q'];
}
@@ -381,8 +383,9 @@
menu_set_active_item('');
}
- if (empty($return)) {
+ if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
drupal_set_title(t('Access denied'));
+ menu_set_active_item('');
$return = t('You are not authorized to access this page.');
}
print theme('page', $return);
@@ -1557,6 +1560,8 @@
*/
function drupal_clear_css_cache() {
file_scan_directory(file_create_path('css'), '.*', array('.', '..', 'CVS'), 'file_delete', TRUE);
+ // Clear the page cache, so cached pages do not reference nonexistent CSS.
+ cache_clear_all();
}
/**
@@ -1656,10 +1661,10 @@
* are added to the page. Then, all settings are output, followed by 'inline'
* JavaScript code.
*
- * @parameter $scope
+ * @param $scope
* (optional) The scope for which the JavaScript rules should be returned.
* Defaults to 'header'.
- * @parameter $javascript
+ * @param $javascript
* (optional) An array with all JavaScript code. Defaults to the default
* JavaScript array for the given scope.
* @return
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/includes/database.mysqli.inc (original)
+++ branches/upstream/current-5/includes/database.mysqli.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: database.mysqli.inc,v 1.32.2.1 2007/10/19 21:49:26 drumm Exp $
+// $Id: database.mysqli.inc,v 1.32.2.3 2008/06/23 04:43:57 drumm Exp $
/**
* @file
@@ -75,6 +75,9 @@
}
$url['host'] = urldecode($url['host']);
$url['path'] = urldecode($url['path']);
+ if (!isset($url['port'])) {
+ $url['port'] = NULL;
+ }
$connection = mysqli_init();
@mysqli_real_connect($connection, $url['host'], $url['user'], $url['pass'], substr($url['path'], 1), $url['port'], NULL, MYSQLI_CLIENT_FOUND_ROWS);
@@ -86,7 +89,7 @@
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 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>The MySQL error was: '. theme('placeholder', mysqli_connect_error($connection)) .'.</p>
<p>Currently, the username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
<ul>
<li>Are you sure you have the correct username and password?</li>
@@ -101,7 +104,7 @@
drupal_maintenance_theme();
drupal_set_title('Unable to select database');
print theme('maintenance_page', '<p>We were able to connect to the MySQL database server (which means your username and password are okay) but not able to select the database.</p>
-<p>The MySQL error was: '. theme('placeholder', mysqli_error($connection)) .'.</p>
+<p>The MySQL error was: '. theme('placeholder', mysqli_connect_error($connection)) .'.</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>
<li>Are you sure you have the correct database name?</li>
Modified: branches/upstream/current-5/includes/file.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/file.inc?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/includes/file.inc (original)
+++ branches/upstream/current-5/includes/file.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: file.inc,v 1.90.2.3 2008/01/07 01:00:22 drumm Exp $
+// $Id: file.inc,v 1.90.2.4 2008/02/11 05:45:48 drumm Exp $
/**
* @file
@@ -728,8 +728,7 @@
if ($max_size < 0) {
$upload_max = parse_size(ini_get('upload_max_filesize'));
- // sanity check- a single upload should not be more than 50% the size limit of the total post
- $post_max = parse_size(ini_get('post_max_size')) / 2;
+ $post_max = parse_size(ini_get('post_max_size'));
$max_size = ($upload_max < $post_max) ? $upload_max : $post_max;
}
return $max_size;
Modified: branches/upstream/current-5/includes/menu.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/menu.inc?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/includes/menu.inc (original)
+++ branches/upstream/current-5/includes/menu.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.inc,v 1.146.2.1 2007/06/17 01:50:50 drumm Exp $
+// $Id: menu.inc,v 1.146.2.2 2008/02/11 05:26:53 drumm Exp $
/**
* @file
@@ -975,7 +975,7 @@
$count = 0;
while ($path && !$count) {
foreach ($menu['items'] as $key => $item) {
- if (isset($item['path']) && $item['path'] == $path) {
+ if (isset($item['path']) && ($item['path'] == $path || ($item['path'] == '<front>' && drupal_is_front_page()))) {
$trails[$count] = array();
$mid = $key;
while ($mid && $menu['items'][$mid]) {
Modified: branches/upstream/current-5/includes/theme.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/theme.inc?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/includes/theme.inc (original)
+++ branches/upstream/current-5/includes/theme.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: theme.inc,v 1.337.2.2 2007/05/31 05:52:42 drumm Exp $
+// $Id: theme.inc,v 1.337.2.5 2008/07/09 21:48:41 drumm Exp $
/**
* @file
@@ -42,7 +42,8 @@
// Only select the user selected theme if it is available in the
// list of enabled themes.
- $theme = $user->theme && $themes[$user->theme]->status ? $user->theme : variable_get('theme_default', 'garland');
+ $theme = !empty($user->theme) && !empty($themes[$user->theme]->status) ? $user->theme : variable_get('theme_default', 'garland');
+
// Allow modules to override the present theme... only select custom theme
// if it is available in the list of installed themes.
@@ -544,16 +545,14 @@
$i = 1;
foreach ($links as $key => $link) {
- $class = '';
+ $class = $key;
// Automatically add a class to each link and also to each LI
if (isset($link['attributes']) && isset($link['attributes']['class'])) {
$link['attributes']['class'] .= ' ' . $key;
- $class = $key;
}
else {
$link['attributes']['class'] = $key;
- $class = $key;
}
// Add first and last classes to the list of links to help out themers.
@@ -564,7 +563,7 @@
if ($i == $num_links) {
$extra_class .= 'last ';
}
- $output .= '<li class="'. $extra_class . $class .'">';
+ $output .= '<li '. drupal_attributes(array('class' => $extra_class . $class)) .'>';
// Is the title HTML?
$html = isset($link['html']) && $link['html'];
@@ -765,17 +764,20 @@
// Format the table header:
if (count($header)) {
$ts = tablesort_init($header);
- $output .= ' <thead><tr>';
+ // HTML requires that the thead tag has tr tags in it follwed by tbody
+ // tags. Using ternary operator to check and see if we have any rows.
+ $output .= (count($rows) ? ' <thead><tr>' : ' <tr>');
foreach ($header as $cell) {
$cell = tablesort_header($cell, $header, $ts);
$output .= _theme_table_cell($cell, TRUE);
}
- $output .= " </tr></thead>\n";
+ // Using ternary operator to close the tags based on whether or not there are rows
+ $output .= (count($rows) ? " </tr></thead>\n" : "</tr>\n");
}
// Format the table rows:
- $output .= "<tbody>\n";
if (count($rows)) {
+ $output .= "<tbody>\n";
$flip = array('even' => 'odd', 'odd' => 'even');
$class = 'even';
foreach ($rows as $number => $row) {
@@ -814,9 +816,10 @@
}
$output .= " </tr>\n";
}
- }
-
- $output .= "</tbody></table>\n";
+ $output .= "</tbody>\n";
+ }
+
+ $output .= "</table>\n";
return $output;
}
Modified: branches/upstream/current-5/includes/xmlrpc.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/xmlrpc.inc?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/includes/xmlrpc.inc (original)
+++ branches/upstream/current-5/includes/xmlrpc.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: xmlrpc.inc,v 1.38.2.2 2007/12/20 07:53:34 drumm Exp $
+// $Id: xmlrpc.inc,v 1.38.2.3 2008/06/07 00:38:35 drumm Exp $
/*
Drupal XML-RPC library. Based on the IXR - The Incutio XML-RPC Library - (c) Incutio Ltd 2002-2005
@@ -396,7 +396,7 @@
$xmlrpc_date->day = substr($time, 6, 2);
$xmlrpc_date->hour = substr($time, 9, 2);
$xmlrpc_date->minute = substr($time, 11, 2);
- $xmlrpc_date->second = substr($time, 14, 2);
+ $xmlrpc_date->second = substr($time, 13, 2);
$xmlrpc_date->iso8601 = $time;
}
return $xmlrpc_date;
Modified: branches/upstream/current-5/includes/xmlrpcs.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/xmlrpcs.inc?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/includes/xmlrpcs.inc (original)
+++ branches/upstream/current-5/includes/xmlrpcs.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: xmlrpcs.inc,v 1.21 2006/07/05 11:45:51 dries Exp $
+// $Id: xmlrpcs.inc,v 1.21.2.1 2008/05/10 01:53:33 drumm Exp $
/**
* The main entry point for XML-RPC requests.
@@ -149,7 +149,7 @@
}
// Has this method been mapped to a Drupal function by us or by modules?
if (!isset($xmlrpc_server->callbacks[$methodname])) {
- return xmlrpc_error(-32601, t('Server error. Requested method %methodname not specified.', array("%methodname" => $xmlrpc_server->message->methodname)));
+ return xmlrpc_error(-32601, t('Server error. Requested method @methodname not specified.', array("@methodname" => $xmlrpc_server->message->methodname)));
}
$method = $xmlrpc_server->callbacks[$methodname];
$signature = $xmlrpc_server->signatures[$methodname];
@@ -208,7 +208,7 @@
}
*/
if (!function_exists($method)) {
- return xmlrpc_error(-32601, t('Server error. Requested function %method does not exist.', array("%method" => $method)));
+ return xmlrpc_error(-32601, t('Server error. Requested function @method does not exist.', array("@method" => $method)));
}
// Call the mapped function
return call_user_func_array($method, $args);
@@ -293,10 +293,10 @@
function xmlrpc_server_method_signature($methodname) {
$xmlrpc_server = xmlrpc_server_get();
if (!isset($xmlrpc_server->callbacks[$methodname])) {
- return xmlrpc_error(-32601, t('Server error. Requested method %methodname not specified.', array("%methodname" => $methodname)));
+ return xmlrpc_error(-32601, t('Server error. Requested method @methodname not specified.', array("@methodname" => $methodname)));
}
if (!is_array($xmlrpc_server->signatures[$methodname])) {
- return xmlrpc_error(-32601, t('Server error. Requested method %methodname signature not specified.', array("%methodname" => $methodname)));
+ return xmlrpc_error(-32601, t('Server error. Requested method @methodname signature not specified.', array("@methodname" => $methodname)));
}
// We array of types
$return = array();
@@ -315,4 +315,4 @@
function xmlrpc_server_method_help($method) {
$xmlrpc_server = xmlrpc_server_get();
return $xmlrpc_server->help[$method];
-}
+}
Modified: branches/upstream/current-5/install.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/install.php?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/install.php (original)
+++ branches/upstream/current-5/install.php Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: install.php,v 1.34.2.4 2007/11/07 08:10:16 drumm Exp $
+// $Id: install.php,v 1.34.2.5 2008/07/09 21:48:41 drumm Exp $
require_once './includes/install.inc';
@@ -153,6 +153,15 @@
include_once './includes/form.inc';
drupal_maintenance_theme();
+ // 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();
+ }
+
// The existing database settings are not working, so we need write access
// to settings.php to change them.
if (!drupal_verify_install_file($settings_file, FILE_EXIST|FILE_READABLE|FILE_WRITABLE)) {
@@ -163,14 +172,6 @@
exit;
}
- // 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'));
print theme('install_page', $output);
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-5/modules/aggregator/aggregator.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/aggregator/aggregator.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/aggregator/aggregator.module?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/aggregator/aggregator.module (original)
+++ branches/upstream/current-5/modules/aggregator/aggregator.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: aggregator.module,v 1.324.2.2 2008/01/10 22:14:24 drumm Exp $
+// $Id: aggregator.module,v 1.324.2.3 2008/04/28 07:41:23 drumm Exp $
/**
* @file
@@ -345,7 +345,7 @@
if ($form_values['op'] == t('Submit')) {
// Check for duplicate titles
if (isset($form_values['cid'])) {
- $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s' AND cid != %d", $form_values['title'], $form_values['cid']));
+ $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s' AND cid <> %d", $form_values['title'], $form_values['cid']));
}
else {
$category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s'", $form_values['title']));
@@ -476,10 +476,10 @@
if ($form_values['op'] == t('Submit')) {
// Check for duplicate titles
if (isset($form_values['fid'])) {
- $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = '%s' OR url='%s') AND fid != %d", $form_values['title'], $form_values['url'], $form_values['fid']);
+ $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = '%s' OR url = '%s') AND fid <> %d", $form_values['title'], $form_values['url'], $form_values['fid']);
}
else {
- $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url='%s'", $form_values['title'], $form_values['url']);
+ $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url = '%s'", $form_values['title'], $form_values['url']);
}
while ($feed = db_fetch_object($result)) {
if (strcasecmp($feed->title, $form_values['title']) == 0) {
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/block/block.info (original)
+++ branches/upstream/current-5/modules/block/block.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/block/block.module (original)
+++ branches/upstream/current-5/modules/block/block.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: block.module,v 1.246.2.6 2007/09/12 07:49:35 drumm Exp $
+// $Id: block.module,v 1.246.2.9 2008/05/13 04:51:04 drumm Exp $
/**
* @file
@@ -320,12 +320,12 @@
// Output region header
if ($status && $region != $last_region) {
$region_title = t('@region', array('@region' => drupal_ucfirst($block_regions[$region])));
- $rows[] = array(array('data' => $region_title, 'class' => 'region', 'colspan' => ($throttle ? 7 : 6)));
+ $rows[] = array(array('data' => $region_title, 'class' => 'region', 'colspan' => ($throttle ? 6 : 5)));
$last_region = $region;
}
// Output disabled header
elseif ($status != $last_status) {
- $rows[] = array(array('data' => t('Disabled'), 'class' => 'region', 'colspan' => ($throttle ? 7 : 6)));
+ $rows[] = array(array('data' => t('Disabled'), 'class' => 'region', 'colspan' => ($throttle ? 6 : 5)));
$last_status = $status;
}
@@ -589,12 +589,11 @@
* Allow users to decide which custom blocks to display when they visit
* the site.
*/
-function block_user($type, $edit, &$user, $category = NULL) {
- global $user;
+function block_user($type, $edit, &$account, $category = NULL) {
switch ($type) {
case 'form':
if ($category == 'account') {
- $rids = array_keys($user->roles);
+ $rids = array_keys($account->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);
@@ -602,7 +601,7 @@
$data = module_invoke($block->module, 'block', 'list');
if ($data[$block->delta]['info']) {
$return = TRUE;
- $form['block'][$block->module][$block->delta] = array('#type' => 'checkbox', '#title' => check_plain($data[$block->delta]['info']), '#default_value' => isset($user->block[$block->module][$block->delta]) ? $user->block[$block->module][$block->delta] : ($block->custom == 1));
+ $form['block'][$block->module][$block->delta] = array('#type' => 'checkbox', '#title' => check_plain($data[$block->delta]['info']), '#default_value' => isset($account->block[$block->module][$block->delta]) ? $account->block[$block->module][$block->delta] : ($block->custom == 1));
}
}
@@ -685,8 +684,23 @@
else {
$page_match = TRUE;
}
-
- if ($enabled && $page_match) {
+ $block->enabled = $enabled;
+ $block->page_match = $page_match;
+ $blocks[$block->region]["{$block->module}_{$block->delta}"] = $block;
+ }
+ }
+
+ // Create an empty array if there were no entries
+ if (!isset($blocks[$region])) {
+ $blocks[$region] = array();
+ }
+
+ foreach ($blocks[$region] as $key => $block) {
+ // Render the block content if it has not been created already.
+ if (!isset($block->content)) {
+ // Erase the block from the static array - we'll put it back if it has content.
+ unset($blocks[$region][$key]);
+ if ($block->enabled && $block->page_match) {
// Check the current throttle status and see if block should be displayed
// based on server load.
if (!($block->throttle && (module_invoke('throttle', 'status') > 0))) {
@@ -708,9 +722,5 @@
}
}
}
- // Create an empty array if there were no entries
- if (!isset($blocks[$region])) {
- $blocks[$region] = array();
- }
return $blocks[$region];
}
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blog/blog.info (original)
+++ branches/upstream/current-5/modules/blog/blog.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/blog/blog.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/blog/blog.module?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blog/blog.module (original)
+++ branches/upstream/current-5/modules/blog/blog.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: blog.module,v 1.271.2.2 2007/04/23 17:05:11 dries Exp $
+// $Id: blog.module,v 1.271.2.3 2008/07/06 00:27:42 drumm Exp $
/**
* @file
@@ -117,9 +117,10 @@
else if ($a == 'feed') {
return blog_feed_last();
}
- else {
+ else if ($a === NULL) {
return blog_page_last();
}
+ drupal_not_found();
}
/**
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-5/modules/blogapi/blogapi.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/blogapi/blogapi.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/blogapi/blogapi.module?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blogapi/blogapi.module (original)
+++ branches/upstream/current-5/modules/blogapi/blogapi.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: blogapi.module,v 1.100.2.2 2007/07/26 19:16:45 drumm Exp $
+// $Id: blogapi.module,v 1.100.2.3 2008/05/26 07:52:40 drumm Exp $
/**
* @file
@@ -18,6 +18,13 @@
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@blogapi">BlogApi page</a>.', array('@blogapi' => 'http://drupal.org/handbook/modules/blogapi/')) .'</p>';
return $output;
}
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function blogapi_perm() {
+ return array('administer content with blog api');
}
/**
@@ -510,7 +517,7 @@
$user = user_authenticate($username, $password);
if ($user->uid) {
- if (user_access('edit own blog', $user)) {
+ if (user_access('administer content with blog api', $user)) {
return $user;
}
else {
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/book/book.info (original)
+++ branches/upstream/current-5/modules/book/book.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/color/color.info (original)
+++ branches/upstream/current-5/modules/color/color.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/color/color.module (original)
+++ branches/upstream/current-5/modules/color/color.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: color.module,v 1.13.2.4 2007/11/12 03:38:08 drumm Exp $
+// $Id: color.module,v 1.13.2.5 2008/02/11 06:53:01 drumm Exp $
/**
* Implementation of hook_help
@@ -265,8 +265,10 @@
$paths['files'][] = $paths['target'] . $base;
}
- // Render new images
- _color_render_images($theme, $info, $paths, $palette);
+ // Render new images, if base image exists
+ if ($info['base_image']) {
+ _color_render_images($theme, $info, $paths, $palette);
+ }
// Rewrite stylesheet
_color_rewrite_stylesheet($theme, $info, $paths, $palette);
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/comment/comment.info (original)
+++ branches/upstream/current-5/modules/comment/comment.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/contact/contact.info (original)
+++ branches/upstream/current-5/modules/contact/contact.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/drupal/drupal.info (original)
+++ branches/upstream/current-5/modules/drupal/drupal.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.info (original)
+++ branches/upstream/current-5/modules/filter/filter.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.module (original)
+++ branches/upstream/current-5/modules/filter/filter.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: filter.module,v 1.160.2.6 2008/01/22 08:43:34 drumm Exp $
+// $Id: filter.module,v 1.160.2.7 2008/07/09 21:48:41 drumm Exp $
/**
* @file
@@ -1244,7 +1244,7 @@
* for scripts and styles.
*/
function filter_xss_admin($string) {
- return filter_xss($string, array('a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'div', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'object', 'ol', 'p', 'param', 'pre', 'q', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'ul', 'var'));
+ return filter_xss($string, array('a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'div', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'ol', 'p', 'param', 'pre', 'q', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'ul', 'var'));
}
/**
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/forum/forum.info (original)
+++ branches/upstream/current-5/modules/forum/forum.info Thu Jul 17 13:34:44 2008
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/forum/forum.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/forum/forum.install?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/forum/forum.install (original)
+++ branches/upstream/current-5/modules/forum/forum.install Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: forum.install,v 1.6 2006/09/01 07:40:08 drumm Exp $
+// $Id: forum.install,v 1.6.2.1 2008/07/06 00:07:13 drumm Exp $
/**
* Implementation of hook_install().
@@ -35,7 +35,6 @@
*/
function forum_uninstall() {
db_query('DROP TABLE {forum}');
- db_query("DELETE FROM {node} WHERE type = 'forum'");
variable_del('forum_containers');
variable_del('forum_nav_vocabulary');
variable_del('forum_hot_topic');
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/forum/forum.module (original)
+++ branches/upstream/current-5/modules/forum/forum.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: forum.module,v 1.375.2.6 2007/08/08 06:27:22 drumm Exp $
+// $Id: forum.module,v 1.375.2.7 2008/04/05 02:18:59 drumm Exp $
/**
* @file
@@ -388,7 +388,7 @@
$form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#default_value' => $node->title, '#required' => TRUE, '#weight' => -5);
if ($node->nid) {
- $forum_terms = taxonomy_node_get_terms_by_vocabulary(_forum_get_vid(), $node->nid);
+ $forum_terms = taxonomy_node_get_terms_by_vocabulary($node->nid, _forum_get_vid());
// if editing, give option to leave shadows
$shadow = (count($forum_terms) > 1);
$form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.'));
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/help/help.info (original)
+++ branches/upstream/current-5/modules/help/help.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/legacy/legacy.info (original)
+++ branches/upstream/current-5/modules/legacy/legacy.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/locale/locale.info (original)
+++ branches/upstream/current-5/modules/locale/locale.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/locale/locale.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/locale/locale.module?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/locale/locale.module (original)
+++ branches/upstream/current-5/modules/locale/locale.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: locale.module,v 1.155 2006/12/27 13:11:59 drumm Exp $
+// $Id: locale.module,v 1.155.2.1 2008/07/09 21:48:42 drumm Exp $
/**
* @file
@@ -111,7 +111,7 @@
'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/settings/locale/string/delete/'. arg(5),
'title' => t('Delete string'),
- 'callback' => 'locale_admin_string_delete',
+ 'callback' => 'locale_admin_string_delete_page',
'callback arguments' => array(arg(5)),
'access' => $access,
'type' => MENU_CALLBACK);
@@ -407,9 +407,29 @@
}
/**
- * Delete a string.
- */
-function locale_admin_string_delete($lid) {
- include_once './includes/locale.inc';
- _locale_string_delete($lid);
-}
+ * String deletion confirmation page.
+ */
+function locale_admin_string_delete_page($lid) {
+ if ($source = db_fetch_object(db_query('SELECT * FROM {locales_source} WHERE lid = %d', $lid))) {
+ return drupal_get_form('locale_string_delete_form', $source);
+ }
+ else {
+ return drupal_not_found();
+ }
+}
+
+/**
+ * User interface for the string deletion confirmation screen.
+ */
+function locale_string_delete_form($source) {
+ $form['lid'] = array('#type' => 'value', '#value' => $source->lid);
+ return confirm_form($form, t('Are you sure you want to delete the string "%source"?', array('%source' => $source->source)), 'admin/build/translate/search', t('Deleting the string will remove all translations of this string in all languages. This action cannot be undone.'), t('Delete'), t('Cancel'));
+}
+
+/**
+ * Process string deletion submissions.
+ */
+function locale_string_delete_form_submit($form_id, $form_values) {
+ include_once './includes/locale.inc';
+ _locale_string_delete($form_values['lid']);
+}
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/menu/menu.info (original)
+++ branches/upstream/current-5/modules/menu/menu.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/node/content_types.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/node/content_types.inc?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/content_types.inc (original)
+++ branches/upstream/current-5/modules/node/content_types.inc Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: content_types.inc,v 1.24.2.3 2007/12/27 09:57:47 drumm Exp $
+// $Id: content_types.inc,v 1.24.2.4 2008/02/11 07:54:44 drumm Exp $
/**
* @file
@@ -236,9 +236,11 @@
if (!preg_match('!^[a-z0-9_]+$!', $type->type)) {
form_set_error('type', t('The machine-readable name can only consist of lowercase letters, underscores, and numbers.'));
}
- // The type cannot be just the character '0', since elsewhere we check it using empty().
- if ($type->type === '0') {
- form_set_error('type', t("Invalid type. Please enter a type name other than '0' (the character zero)."));
+ // 'theme' conflicts with theme_node_form()
+ // 'add' and 'list' conflict with menu paths
+ // '0' is invalid, since elsewhere we check it using empty().
+ if (in_array($type->type, array('0', 'theme', 'add', 'list'))) {
+ form_set_error('type', t("Invalid machine-readable name. Please enter a name other than %invalid.", array('%invalid' => $type->type)));
}
}
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/node.info (original)
+++ branches/upstream/current-5/modules/node/node.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/node.module (original)
+++ branches/upstream/current-5/modules/node/node.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: node.module,v 1.776.2.22 2008/01/07 01:31:26 drumm Exp $
+// $Id: node.module,v 1.776.2.28 2008/06/07 00:52:54 drumm Exp $
/**
* @file
@@ -139,7 +139,20 @@
}
/**
- * Automatically generate a teaser for a node body in a given format.
+ * Automatically generate a teaser for a node body.
+ *
+ * If the end of the teaser is not indicated using the <!--break--> delimiter
+ * then we try to end it at a sensible place, such as the end of a paragraph,
+ * a line break, or the end of a sentence (in that order of preference).
+ *
+ * @param $body
+ * The content for which a teaser will be generated.
+ * @param $format
+ * The format of the content. If the content contains PHP code, we do not
+ * split it up to prevent parse errors. If the line break filter is present
+ * then we treat newlines embedded in $body as line breaks.
+ * @return
+ * The generated teaser.
*/
function node_teaser($body, $format = NULL) {
@@ -169,40 +182,67 @@
}
// If we have a short body, the entire body is the teaser.
- if (strlen($body) < $size) {
+ if (strlen($body) <= $size) {
return $body;
}
+
+ // If the delimiter has not been specified, try to split at paragraph or
+ // sentence boundaries.
// The teaser may not be longer than maximum length specified. Initial slice.
$teaser = truncate_utf8($body, $size);
- $position = 0;
- // Cache the reverse of the teaser.
+
+ // Store the actual length of the UTF8 string -- which might not be the same
+ // as $size.
+ $max_rpos = strlen($teaser);
+
+ // How much to cut off the end of the teaser so that it doesn't end in the
+ // middle of a paragraph, sentence, or word.
+ // Initialize it to maximum in order to find the minimum.
+ $min_rpos = $max_rpos;
+
+ // Store the reverse of the teaser. We use strpos on the reversed needle and
+ // haystack for speed and convenience.
$reversed = strrev($teaser);
- // In some cases, no delimiter has been specified. In this case, we try to
- // split at paragraph boundaries.
- $breakpoints = array('</p>' => 0, '<br />' => 6, '<br>' => 4, "\n" => 1);
- // We use strpos on the reversed needle and haystack for speed.
- foreach ($breakpoints as $point => $offset) {
- $length = strpos($reversed, strrev($point));
- if ($length !== FALSE) {
- $position = - $length - $offset;
- return ($position == 0) ? $teaser : substr($teaser, 0, $position);
- }
- }
-
- // When even the first paragraph is too long, we try to split at the end of
- // the last full sentence.
- $breakpoints = array('. ' => 1, '! ' => 1, '? ' => 1, '。' => 0, '؟ ' => 1);
- $min_length = strlen($reversed);
- foreach ($breakpoints as $point => $offset) {
- $length = strpos($reversed, strrev($point));
- if ($length !== FALSE) {
- $min_length = min($length, $min_length);
- $position = 0 - $length - $offset;
- }
- }
- return ($position == 0) ? $teaser : substr($teaser, 0, $position);
+ // Build an array of arrays of break points grouped by preference.
+ $break_points = array();
+
+ // A paragraph near the end of sliced teaser is most preferable.
+ $break_points[] = array('</p>' => 0);
+
+ // If no complete paragraph then treat line breaks as paragraphs.
+ $line_breaks = array('<br />' => 6, '<br>' => 4);
+ // Newline only indicates a line break if line break converter
+ // filter is present.
+ if (isset($filters['filter/2'])) {
+ $line_breaks["\n"] = 1;
+ }
+ $break_points[] = $line_breaks;
+
+ // If the first paragraph is too long, split at the end of a sentence.
+ $break_points[] = array('. ' => 1, '! ' => 1, '? ' => 1, '。' => 0, '؟ ' => 1);
+
+ // Iterate over the groups of break points until a break point is found.
+ foreach ($break_points as $points) {
+ // Look for each break point, starting at the end of the teaser.
+ foreach ($points as $point => $offset) {
+ // The teaser is already reversed, but the break point isn't.
+ $rpos = strpos($reversed, strrev($point));
+ if ($rpos !== FALSE) {
+ $min_rpos = min($rpos + $offset, $min_rpos);
+ }
+ }
+
+ // If a break point was found in this group, slice and return the teaser.
+ if ($min_rpos !== $max_rpos) {
+ // Don't slice with length 0. Length must be <0 to slice from RHS.
+ return ($min_rpos === 0) ? $teaser : substr($teaser, 0, 0 - $min_rpos);
+ }
+ }
+
+ // If a break point was not found, still return a teaser.
+ return $teaser;
}
/**
@@ -519,7 +559,7 @@
else {
// Turn the conditions into a query.
foreach ($param as $key => $value) {
- $cond[] = 'n.'. db_escape_string($key) ." = '%s'";
+ $cond[] = 'n.'. db_escape_table($key) ." = '%s'";
$arguments[] = $value;
}
$cond = implode(' AND ', $cond);
@@ -1747,7 +1787,7 @@
node_save($node);
drupal_set_message(t('%title has been reverted back to the revision from %revision-date', array('%revision-date' => format_date($node->revision_timestamp), '%title' => $node->title)));
- watchdog('content', t('@type: reverted %title revision %revision.', array('@type' => t($node->type), '%title' => $node->title, '%revision' => $revision)));
+ watchdog('content', t('@type: reverted %title revision %revision.', array('@type' => t($node->type), '%title' => $node->title, '%revision' => $node->vid)));
return 'node/'. $node->nid .'/revisions';
}
@@ -1882,7 +1922,7 @@
// Allow modules to add additional item fields and/or modify $item
$extra = node_invoke_nodeapi($item, 'rss item');
- $extra = array_merge($extra, array(array('key' => 'pubDate', 'value' => date('r', $item->created)), array('key' => 'dc:creator', 'value' => $item->name), array('key' => 'guid', 'value' => $item->nid .' at '. $base_url, 'attributes' => array('isPermaLink' => 'false'))));
+ $extra = array_merge($extra, array(array('key' => 'pubDate', 'value' => format_date($item->created, 'custom', 'r')), array('key' => 'dc:creator', 'value' => $item->name), array('key' => 'guid', 'value' => $item->nid .' at '. $base_url, 'attributes' => array('isPermaLink' => 'false'))));
foreach ($extra as $element) {
if ($element['namespace']) {
$namespaces = array_merge($namespaces, $element['namespace']);
@@ -1949,9 +1989,9 @@
else {
$node->uid = 0;
}
-
- $node->created = $node->date ? strtotime($node->date) : NULL;
- }
+ }
+
+ $node->created = !empty($node->date) ? strtotime($node->date) : time();
// Do node-type-specific validation checks.
node_invoke($node, 'submit');
@@ -2005,16 +2045,14 @@
}
function node_object_prepare(&$node) {
- if (user_access('administer nodes')) {
- // Set up default values, if required.
- if (!isset($node->created)) {
- $node->created = time();
- }
-
- if (!isset($node->date)) {
- $node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O');
- }
- }
+ // Set up default values, if required.
+ if (!isset($node->created)) {
+ $node->created = time();
+ }
+ if (!isset($node->date)) {
+ $node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O');
+ }
+
node_invoke($node, 'prepare');
node_invoke_nodeapi($node, 'prepare');
}
@@ -2086,9 +2124,9 @@
'#weight' => 20,
);
$form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name ? $node->name : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))));
- $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => $node->date)));
-
- if (isset($node->nid)) {
+ $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => !empty($node->date) ? $node->date : format_date($node->created, 'custom', 'Y-m-d H:i:s O'))));
+
+ if (isset($node->date)) {
$form['author']['date']['#default_value'] = $node->date;
}
@@ -2213,7 +2251,7 @@
$title = t('Add a new @s.', array('@s' => $type->name));
$out = '<dt>'. l(drupal_ucfirst($type->name), "node/add/$type_url_str", array('title' => $title)) .'</dt>';
$out .= '<dd>'. filter_xss_admin($type->description) .'</dd>';
- $item[$type->type] = $out;
+ $item[$type->name] = $out;
}
}
@@ -2252,10 +2290,6 @@
$node->picture = $user->picture;
}
- // Set the timestamps when needed:
- if ($node->date) {
- $node->created = strtotime($node->date);
- }
$node->changed = time();
// Extract a teaser, if it hasn't been set (e.g. by a module-provided
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/path/path.info (original)
+++ branches/upstream/current-5/modules/path/path.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/path/path.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/path/path.module?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/path/path.module (original)
+++ branches/upstream/current-5/modules/path/path.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: path.module,v 1.105.2.1 2007/05/21 00:52:28 drumm Exp $
+// $Id: path.module,v 1.105.2.2 2008/02/11 05:11:58 drumm Exp $
/**
* @file
@@ -211,7 +211,7 @@
* than through the administrative interface.
*/
function path_nodeapi(&$node, $op, $arg) {
- if (user_access('create url aliases') || user_access('administer url aliases')) {
+ if (user_access('create url aliases') || user_access('administer url aliases') || ($op == 'load')) {
switch ($op) {
case 'validate':
$node->path = trim($node->path);
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/ping/ping.info (original)
+++ branches/upstream/current-5/modules/ping/ping.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/poll/poll.info (original)
+++ branches/upstream/current-5/modules/poll/poll.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/profile/profile.info (original)
+++ branches/upstream/current-5/modules/profile/profile.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/profile/profile.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/profile/profile.module?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/profile/profile.module (original)
+++ branches/upstream/current-5/modules/profile/profile.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: profile.module,v 1.189.2.8 2007/07/26 19:16:48 drumm Exp $
+// $Id: profile.module,v 1.189.2.9 2008/02/11 05:36:07 drumm Exp $
/**
* @file
@@ -335,6 +335,14 @@
}
if (db_result(db_query("SELECT fid FROM {profile_fields} WHERE name = '%s'". $query_suffix, $args2))) {
form_set_error('name', t('The specified name is already in use.'));
+ }
+ if ($form_values['visibility'] == PROFILE_HIDDEN) {
+ if ($form_values['required']) {
+ form_set_error('required', t('A hidden field cannot be required.'));
+ }
+ if ($form_values['register']) {
+ form_set_error('register', t('A hidden field cannot be set to visible on the user registration form.'));
+ }
}
}
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/search/search.info (original)
+++ branches/upstream/current-5/modules/search/search.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/modules/search/search.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/search/search.module?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/search/search.module (original)
+++ branches/upstream/current-5/modules/search/search.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: search.module,v 1.209.2.5 2007/07/26 19:16:48 drumm Exp $
+// $Id: search.module,v 1.209.2.6 2008/05/14 06:35:29 drumm Exp $
/**
* @file
@@ -1043,9 +1043,6 @@
'#attributes' => array('title' => t('Enter the terms you wish to search for.')),
);
$form['submit'] = array('#type' => 'submit', '#value' => t('Search'));
- // Always go to the search page since the search form is not guaranteed to be
- // on every page.
- $form['#action'] = url('search/node');
$form['#base'] = 'search_box_form';
return $form;
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/statistics/statistics.info (original)
+++ branches/upstream/current-5/modules/statistics/statistics.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.info (original)
+++ branches/upstream/current-5/modules/system/system.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.install (original)
+++ branches/upstream/current-5/modules/system/system.install Thu Jul 17 13:34:44 2008
@@ -1,9 +1,9 @@
<?php
-// $Id: system.install,v 1.69.2.10 2008/01/22 09:42:01 drumm Exp $
+// $Id: system.install,v 1.69.2.11 2008/02/25 02:25:36 drumm Exp $
define('DRUPAL_MINIMUM_PHP', '4.3.5');
define('DRUPAL_MINIMUM_MYSQL', '3.23.17'); // If using MySQL
-define('DRUPAL_MINIMUM_PGSQL', '7.3'); // If using PostgreSQL
+define('DRUPAL_MINIMUM_PGSQL', '7.4'); // If using PostgreSQL
/**
* Test and report Drupal installation requirements.
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.module (original)
+++ branches/upstream/current-5/modules/system/system.module Thu Jul 17 13:34:44 2008
@@ -1,12 +1,12 @@
<?php
-// $Id: system.module,v 1.440.2.29 2008/01/29 00:00:44 drumm Exp $
+// $Id: system.module,v 1.440.2.31 2008/07/09 21:48:42 drumm Exp $
/**
* @file
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '5.7');
+define('VERSION', '5.8');
/**
* 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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.module (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.module,v 1.330.2.15 2007/12/20 07:48:11 drumm Exp $
+// $Id: taxonomy.module,v 1.330.2.17 2008/07/06 00:50:44 drumm Exp $
/**
* @file
@@ -1074,6 +1074,7 @@
else {
$result = db_query(db_rewrite_sql("SELECT t.tid, COUNT(n.nid) AS c FROM {term_node} t INNER JOIN {node} n ON t.nid = n.nid WHERE n.status = 1 AND n.type = '%s' GROUP BY t.tid"), $type);
}
+ $count[$type] = array();
while ($term = db_fetch_object($result)) {
$count[$type][$term->tid] = $term->c;
}
@@ -1122,7 +1123,7 @@
* An array of matching term objects.
*/
function taxonomy_get_term_by_name($name) {
- $db_result = db_query(db_rewrite_sql("SELECT t.tid, t.* FROM {term_data} t WHERE LOWER('%s') LIKE LOWER(t.name)", 't', 'tid'), trim($name));
+ $db_result = db_query(db_rewrite_sql("SELECT t.tid, t.* FROM {term_data} t WHERE LOWER('%s') = LOWER(t.name)", 't', 'tid'), trim($name));
$result = array();
while ($term = db_fetch_object($db_result)) {
$result[] = $term;
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/throttle/throttle.info (original)
+++ branches/upstream/current-5/modules/throttle/throttle.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/tracker/tracker.info (original)
+++ branches/upstream/current-5/modules/tracker/tracker.info Thu Jul 17 13:34:44 2008
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/upload/upload.info (original)
+++ branches/upstream/current-5/modules/upload/upload.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/upload/upload.module (original)
+++ branches/upstream/current-5/modules/upload/upload.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: upload.module,v 1.148.2.3 2008/01/07 01:00:23 drumm Exp $
+// $Id: upload.module,v 1.148.2.4 2008/05/26 05:03:47 drumm Exp $
/**
* @file
@@ -864,6 +864,7 @@
if ($width && $height) {
$result = image_scale($file->filepath, $file->filepath, $width, $height);
if ($result) {
+ clearstatcache();
$file->filesize = filesize($file->filepath);
drupal_set_message(t('The image was resized to fit within the maximum allowed resolution of %resolution pixels.', array('%resolution' => variable_get('upload_max_resolution', 0))));
}
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.info (original)
+++ branches/upstream/current-5/modules/user/user.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.module (original)
+++ branches/upstream/current-5/modules/user/user.module Thu Jul 17 13:34:44 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.745.2.26 2008/01/07 02:30:35 drumm Exp $
+// $Id: user.module,v 1.745.2.30 2008/05/10 02:12:41 drumm Exp $
/**
* @file
@@ -895,7 +895,7 @@
-function user_login($msg = '') {
+function user_login() {
global $user;
// If we are already logged on, go to the user page instead.
@@ -904,9 +904,6 @@
}
// Display login form:
- if ($msg) {
- $form['message'] = array('#value' => '<p>'. check_plain($msg) .'</p>');
- }
$form['name'] = array('#type' => 'textfield',
'#title' => t('Username'),
'#size' => 60,
@@ -1007,9 +1004,15 @@
if ($server) {
$name .= '@'. $server;
}
- $user = user_load(array('name' => $name));
- if (!$user->uid) { // Register this new user.
- $userinfo = array('name' => $name, 'pass' => user_password(), 'init' => $name, 'status' => 1);
+ $registered_user = user_load(array('name' => $name));
+ if (!$registered_user->uid) { // Register this new user.
+ $userinfo = array(
+ 'name' => $name,
+ 'pass' => user_password(),
+ 'init' => $name,
+ 'status' => 1,
+ 'access' => time(),
+ );
if ($server) {
$userinfo["authname_$module"] = $name;
}
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=1891&op=diff
==============================================================================
--- branches/upstream/current-5/modules/watchdog/watchdog.info (original)
+++ branches/upstream/current-5/modules/watchdog/watchdog.info Thu Jul 17 13:34:44 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-29
-version = "5.7"
+; Information added by drupal.org packaging script on 2008-07-09
+version = "5.8"
project = "drupal"
-datestamp = "1201565404"
+datestamp = "1215640809"
Modified: branches/upstream/current-5/robots.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/robots.txt?rev=1891&op=diff
==============================================================================
--- branches/upstream/current-5/robots.txt (original)
+++ branches/upstream/current-5/robots.txt Thu Jul 17 13:34:44 2008
@@ -1,4 +1,4 @@
-# $Id: robots.txt,v 1.7.2.1 2007/03/23 18:57:07 drumm Exp $
+# $Id: robots.txt,v 1.7.2.2 2008/02/25 02:18:25 drumm Exp $
#
# robots.txt
#
@@ -43,7 +43,6 @@
Disallow: /UPGRADE.txt
# Paths (clean URLs)
Disallow: /admin/
-Disallow: /aggregator/
Disallow: /comment/reply/
Disallow: /contact/
Disallow: /logout/
@@ -54,7 +53,6 @@
Disallow: /user/login/
# Paths (no clean URLs)
Disallow: /?q=admin/
-Disallow: /?q=aggregator/
Disallow: /?q=comment/reply/
Disallow: /?q=contact/
Disallow: /?q=logout/
More information about the Pkg-drupal-commits
mailing list