[Pkg-drupal-commits] r2135 - in /branches/upstream/current-6: ./ includes/ modules/aggregator/ modules/block/ modules/blog/ modules/blogapi/ modules/book/ modules/color/ modules/comment/ modules/contact/ modules/dblog/ modules/filter/ modules/forum/ modules/help/ modules/locale/ modules/menu/ modules/node/ modules/openid/ modules/path/ modules/php/ modules/ping/ modules/poll/ modules/profile/ modules/search/ modules/statistics/ modules/syslog/ modules/system/ modules/taxonomy/ modules/throttle/ modules/tracker/ modules/translation/ modules/trigger/ modules/update/ modules/upload/ modules/user/ themes/bluemarine/ themes/chameleon/ themes/chameleon/marvin/ themes/engines/phptemplate/ themes/garland/ themes/garland/minnelli/ themes/pushbutton/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Sun Jun 6 20:30:54 UTC 2010
Author: luigi
Date: Sun Jun 6 20:30:52 2010
New Revision: 2135
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2135
Log:
[svn-upgrade] new version drupal6 (6.17)
Modified:
branches/upstream/current-6/CHANGELOG.txt
branches/upstream/current-6/UPGRADE.txt
branches/upstream/current-6/includes/actions.inc
branches/upstream/current-6/includes/bootstrap.inc
branches/upstream/current-6/includes/common.inc
branches/upstream/current-6/includes/database.pgsql.inc
branches/upstream/current-6/includes/file.inc
branches/upstream/current-6/includes/form.inc
branches/upstream/current-6/includes/language.inc
branches/upstream/current-6/includes/locale.inc
branches/upstream/current-6/includes/lock.inc
branches/upstream/current-6/includes/mail.inc
branches/upstream/current-6/includes/path.inc
branches/upstream/current-6/includes/xmlrpc.inc
branches/upstream/current-6/includes/xmlrpcs.inc
branches/upstream/current-6/install.php
branches/upstream/current-6/modules/aggregator/aggregator.info
branches/upstream/current-6/modules/aggregator/aggregator.module
branches/upstream/current-6/modules/block/block.info
branches/upstream/current-6/modules/blog/blog.info
branches/upstream/current-6/modules/blogapi/blogapi.info
branches/upstream/current-6/modules/book/book.info
branches/upstream/current-6/modules/color/color.info
branches/upstream/current-6/modules/comment/comment.info
branches/upstream/current-6/modules/comment/comment.module
branches/upstream/current-6/modules/contact/contact.info
branches/upstream/current-6/modules/dblog/dblog.info
branches/upstream/current-6/modules/filter/filter.info
branches/upstream/current-6/modules/filter/filter.module
branches/upstream/current-6/modules/forum/forum.info
branches/upstream/current-6/modules/help/help.info
branches/upstream/current-6/modules/locale/locale.info
branches/upstream/current-6/modules/menu/menu.admin.inc
branches/upstream/current-6/modules/menu/menu.info
branches/upstream/current-6/modules/node/node.info
branches/upstream/current-6/modules/node/node.module
branches/upstream/current-6/modules/openid/openid.info
branches/upstream/current-6/modules/path/path.info
branches/upstream/current-6/modules/php/php.info
branches/upstream/current-6/modules/ping/ping.info
branches/upstream/current-6/modules/poll/poll.info
branches/upstream/current-6/modules/poll/poll.module
branches/upstream/current-6/modules/profile/profile.info
branches/upstream/current-6/modules/search/search.info
branches/upstream/current-6/modules/search/search.module
branches/upstream/current-6/modules/statistics/statistics.admin.inc
branches/upstream/current-6/modules/statistics/statistics.info
branches/upstream/current-6/modules/statistics/statistics.module
branches/upstream/current-6/modules/syslog/syslog.info
branches/upstream/current-6/modules/system/system.info
branches/upstream/current-6/modules/system/system.install
branches/upstream/current-6/modules/system/system.module
branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc
branches/upstream/current-6/modules/taxonomy/taxonomy.info
branches/upstream/current-6/modules/taxonomy/taxonomy.module
branches/upstream/current-6/modules/throttle/throttle.info
branches/upstream/current-6/modules/tracker/tracker.info
branches/upstream/current-6/modules/translation/translation.info
branches/upstream/current-6/modules/trigger/trigger.info
branches/upstream/current-6/modules/update/update.compare.inc
branches/upstream/current-6/modules/update/update.info
branches/upstream/current-6/modules/update/update.install
branches/upstream/current-6/modules/upload/upload.info
branches/upstream/current-6/modules/upload/upload.module
branches/upstream/current-6/modules/user/user.info
branches/upstream/current-6/modules/user/user.module
branches/upstream/current-6/modules/user/user.pages.inc
branches/upstream/current-6/themes/bluemarine/bluemarine.info
branches/upstream/current-6/themes/chameleon/chameleon.info
branches/upstream/current-6/themes/chameleon/marvin/marvin.info
branches/upstream/current-6/themes/engines/phptemplate/phptemplate.engine
branches/upstream/current-6/themes/garland/garland.info
branches/upstream/current-6/themes/garland/minnelli/minnelli.info
branches/upstream/current-6/themes/garland/template.php
branches/upstream/current-6/themes/pushbutton/pushbutton.info
Modified: branches/upstream/current-6/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/CHANGELOG.txt?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/CHANGELOG.txt (original)
+++ branches/upstream/current-6/CHANGELOG.txt Sun Jun 6 20:30:52 2010
@@ -1,4 +1,13 @@
-// $Id: CHANGELOG.txt,v 1.253.2.37 2010/03/04 00:15:28 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.39 2010/06/02 18:52:32 goba Exp $
+
+Drupal 6.17, 2010-06-02
+----------------------
+- Improved PostgreSQL compatibility
+- Better PHP 5.3 and PHP 4 compatibility
+- Better browser compatibility of CSS and JS aggregation
+- Improved logging for login failures
+- Fixed an incompatibility with some contributed modules and the locking system
+- Fixed a variety of other bugs.
Drupal 6.16, 2010-03-03
----------------------
Modified: branches/upstream/current-6/UPGRADE.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/UPGRADE.txt?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/UPGRADE.txt (original)
+++ branches/upstream/current-6/UPGRADE.txt Sun Jun 6 20:30:52 2010
@@ -1,4 +1,4 @@
-// $Id: UPGRADE.txt,v 1.12 2008/01/04 16:15:58 goba Exp $
+// $Id: UPGRADE.txt,v 1.12.2.1 2010/05/11 09:39:36 goba Exp $
UPGRADING
---------
@@ -14,12 +14,10 @@
Let's begin!
-1. Backup your database and Drupal directory - especially your "sites"
- directory which contains your configuration file and added modules and
- themes, any contributed or custom modules in your "modules" directory,
- and your "files" directory which contains uploaded files. If other files
- have modifications, such as .htaccess or robots.txt, those should be
- backed up as well.
+1. Back up your Drupal database and site root directory. Be especially sure
+ to back up your "sites" directory which contains your configuration file,
+ added modules and themes, and your site's uploaded files. If other files
+ have modifications, such as .htaccess or robots.txt, back those up as well.
Note: for a single site setup, the configuration file is the "settings.php"
file located at sites/default/settings.php. The default.settings.php file
Modified: branches/upstream/current-6/includes/actions.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/actions.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/actions.inc (original)
+++ branches/upstream/current-6/includes/actions.inc Sun Jun 6 20:30:52 2010
@@ -1,9 +1,47 @@
<?php
-// $Id: actions.inc,v 1.8.2.10 2009/11/06 08:14:05 goba Exp $
+// $Id: actions.inc,v 1.8.2.12 2010/05/28 15:08:22 goba Exp $
/**
* @file
* This is the actions engine for executing stored actions.
+ */
+
+/**
+ * @defgroup actions Actions
+ * @{
+ * Functions that perform an action on a certain system object.
+ *
+ * All modules should declare their action functions to be in this group and
+ * each action function should reference its configuration form, validate, and
+ * submit functions using \@see. Conversely, form, validate, and submit
+ * functions should reference the action function using \@see. For examples of
+ * this see comment_unpublish_by_keyword_action(), which has the following in
+ * its doxygen documentation:
+ *
+ * \@ingroup actions
+ * \@see comment_unpublish_by_keyword_action_form().
+ * \@see comment_unpublish_by_keyword_action_submit().
+ *
+ * @} End of "defgroup actions".
+ */
+
+/**
+ * @defgroup actions Actions
+ * @{
+ * Functions that perform an action on a certain system object.
+ *
+ * All modules should declare their action functions to be in this group and
+ * each action function should reference its configuration form, validate, and
+ * submit functions using \@see. Conversely, form, validate, and submit
+ * functions should reference the action function using \@see. For examples of
+ * this see comment_unpublish_by_keyword_action(), which has the following in
+ * its doxygen documentation:
+ *
+ * \@ingroup actions
+ * \@see comment_unpublish_by_keyword_action_form().
+ * \@see comment_unpublish_by_keyword_action_submit().
+ *
+ * @} End of "defgroup actions".
*/
/**
@@ -81,8 +119,13 @@
foreach ($actions as $action_id => $params) {
if (is_numeric($action_id)) { // Configurable actions need parameters.
$function = $params['callback'];
- $context = array_merge($context, $params);
- $result[$action_id] = $function($object, $context, $a1, $a2);
+ if (function_exists($function)) {
+ $context = array_merge($context, $params);
+ $actions_result[$action_id] = $function($object, $context, $a1, $a2);
+ }
+ else {
+ $actions_result[$action_id] = FALSE;
+ }
}
// Singleton action; $action_id is the function name.
else {
@@ -96,8 +139,13 @@
if (is_numeric($action_ids)) {
$action = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $action_ids));
$function = $action->callback;
- $context = array_merge($context, unserialize($action->parameters));
- $result[$action_ids] = $function($object, $context, $a1, $a2);
+ if (function_exists($function)) {
+ $context = array_merge($context, unserialize($action->parameters));
+ $actions_result[$action_ids] = $function($object, $context, $a1, $a2);
+ }
+ else {
+ $actions_result[$action_ids] = FALSE;
+ }
}
// Singleton action; $action_ids is the function name.
else {
Modified: branches/upstream/current-6/includes/bootstrap.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/bootstrap.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/bootstrap.inc (original)
+++ branches/upstream/current-6/includes/bootstrap.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: bootstrap.inc,v 1.206.2.14 2010/02/01 16:49:14 goba Exp $
+// $Id: bootstrap.inc,v 1.206.2.23 2010/06/02 13:07:45 goba Exp $
/**
* @file
@@ -35,19 +35,92 @@
define('CACHE_AGGRESSIVE', 2);
/**
- *
- * Severity levels, as defined in RFC 3164 http://www.faqs.org/rfcs/rfc3164.html
+ * Log message severity -- Emergency: system is unusable.
+ *
+ * The WATCHDOG_* constant definitions correspond to the logging severity levels
+ * defined in RFC 3164, section 4.1.1: http://www.faqs.org/rfcs/rfc3164.html
+ *
* @see watchdog()
* @see watchdog_severity_levels()
*/
-define('WATCHDOG_EMERG', 0); // Emergency: system is unusable
-define('WATCHDOG_ALERT', 1); // Alert: action must be taken immediately
-define('WATCHDOG_CRITICAL', 2); // Critical: critical conditions
-define('WATCHDOG_ERROR', 3); // Error: error conditions
-define('WATCHDOG_WARNING', 4); // Warning: warning conditions
-define('WATCHDOG_NOTICE', 5); // Notice: normal but significant condition
-define('WATCHDOG_INFO', 6); // Informational: informational messages
-define('WATCHDOG_DEBUG', 7); // Debug: debug-level messages
+define('WATCHDOG_EMERG', 0);
+
+/**
+ * Log message severity -- Alert: action must be taken immediately.
+ *
+ * The WATCHDOG_* constant definitions correspond to the logging severity levels
+ * defined in RFC 3164, section 4.1.1: http://www.faqs.org/rfcs/rfc3164.html
+ *
+ * @see watchdog()
+ * @see watchdog_severity_levels()
+ */
+define('WATCHDOG_ALERT', 1);
+
+/**
+ * Log message severity -- Critical: critical conditions.
+ *
+ * The WATCHDOG_* constant definitions correspond to the logging severity levels
+ * defined in RFC 3164, section 4.1.1: http://www.faqs.org/rfcs/rfc3164.html
+ *
+ * @see watchdog()
+ * @see watchdog_severity_levels()
+ */
+define('WATCHDOG_CRITICAL', 2);
+
+/**
+ * Log message severity -- Error: error conditions.
+ *
+ * The WATCHDOG_* constant definitions correspond to the logging severity levels
+ * defined in RFC 3164, section 4.1.1: http://www.faqs.org/rfcs/rfc3164.html
+ *
+ * @see watchdog()
+ * @see watchdog_severity_levels()
+ */
+define('WATCHDOG_ERROR', 3);
+
+/**
+ * Log message severity -- Warning: warning conditions.
+ *
+ * The WATCHDOG_* constant definitions correspond to the logging severity levels
+ * defined in RFC 3164, section 4.1.1: http://www.faqs.org/rfcs/rfc3164.html
+ *
+ * @see watchdog()
+ * @see watchdog_severity_levels()
+ */
+define('WATCHDOG_WARNING', 4);
+
+/**
+ * Log message severity -- Notice: normal but significant condition.
+ *
+ * The WATCHDOG_* constant definitions correspond to the logging severity levels
+ * defined in RFC 3164, section 4.1.1: http://www.faqs.org/rfcs/rfc3164.html
+ *
+ * @see watchdog()
+ * @see watchdog_severity_levels()
+ */
+define('WATCHDOG_NOTICE', 5);
+
+/**
+ * Log message severity -- Informational: informational messages.
+ *
+ * The WATCHDOG_* constant definitions correspond to the logging severity levels
+ * defined in RFC 3164, section 4.1.1: http://www.faqs.org/rfcs/rfc3164.html
+ *
+ * @see watchdog()
+ * @see watchdog_severity_levels()
+ */
+define('WATCHDOG_INFO', 6);
+
+/**
+ * Log message severity -- Debug: debug-level messages.
+ *
+ * The WATCHDOG_* constant definitions correspond to the logging severity levels
+ * defined in RFC 3164, section 4.1.1: http://www.faqs.org/rfcs/rfc3164.html
+ *
+ * @see watchdog()
+ * @see watchdog_severity_levels()
+ */
+define('WATCHDOG_DEBUG', 7);
/**
* First bootstrap phase: initialize configuration.
@@ -366,6 +439,13 @@
// We escape the hostname because it can be modified by a visitor.
if (!empty($_SERVER['HTTP_HOST'])) {
$cookie_domain = check_plain($_SERVER['HTTP_HOST']);
+ // Strip leading periods, www., and port numbers from cookie domain.
+ $cookie_domain = ltrim($cookie_domain, '.');
+ if (strpos($cookie_domain, 'www.') === 0) {
+ $cookie_domain = substr($cookie_domain, 4);
+ }
+ $cookie_domain = explode(':', $cookie_domain);
+ $cookie_domain = '.'. $cookie_domain[0];
}
}
// To prevent session cookies from being hijacked, a user can configure the
@@ -377,13 +457,6 @@
if (ini_get('session.cookie_secure')) {
$session_name .= 'SSL';
}
- // Strip leading periods, www., and port numbers from cookie domain.
- $cookie_domain = ltrim($cookie_domain, '.');
- if (strpos($cookie_domain, 'www.') === 0) {
- $cookie_domain = substr($cookie_domain, 4);
- }
- $cookie_domain = explode(':', $cookie_domain);
- $cookie_domain = '.'. $cookie_domain[0];
// Per RFC 2109, cookie domains must contain at least one dot other than the
// first. For hosts such as 'localhost' or IP Addresses we don't set a cookie domain.
if (count(explode('.', $cookie_domain)) > 2 && !is_numeric(str_replace('.', '', $cookie_domain))) {
@@ -674,14 +747,18 @@
header("Expires: Sun, 19 Nov 1978 05:00:00 GMT");
header("Cache-Control: must-revalidate");
- if (variable_get('page_compression', TRUE)) {
+ if (variable_get('page_compression', TRUE) && extension_loaded('zlib')) {
// Determine if the browser accepts gzipped data.
- if (@strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') === FALSE && function_exists('gzencode')) {
- // Strip the gzip header and run uncompress.
+ if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE) {
+ // $cache->data is already gzip'ed, so make sure zlib.output_compression
+ // does not compress it once more.
+ ini_set('zlib.output_compression', '0');
+ header('Content-Encoding: gzip');
+ }
+ else {
+ // The client does not support compression, so unzip the data in the
+ // cache. Strip the gzip header and run uncompress.
$cache->data = gzinflate(substr(substr($cache->data, 10), 0, -8));
- }
- elseif (function_exists('gzencode')) {
- header('Content-Encoding: gzip');
}
}
@@ -734,11 +811,35 @@
/**
* Encode special characters in a plain-text string for display as HTML.
*
- * Uses drupal_validate_utf8 to prevent cross site scripting attacks on
+ * Also validates strings as UTF-8 to prevent cross site scripting attacks on
* Internet Explorer 6.
+ *
+ * @param $text
+ * The text to be checked or processed.
+ * @return
+ * An HTML safe version of $text, or an empty string if $text is not
+ * valid UTF-8.
+ *
+ * @see drupal_validate_utf8().
*/
function check_plain($text) {
- return drupal_validate_utf8($text) ? htmlspecialchars($text, ENT_QUOTES) : '';
+ static $php525;
+
+ if (!isset($php525)) {
+ $php525 = version_compare(PHP_VERSION, '5.2.5', '>=');
+ }
+ // We duplicate the preg_match() to validate strings as UTF-8 from
+ // drupal_validate_utf8() here. This avoids the overhead of an additional
+ // function call, since check_plain() may be called hundreds of times during
+ // a request. For PHP 5.2.5+, this check for valid UTF-8 should be handled
+ // internally by PHP in htmlspecialchars().
+ // @see http://www.php.net/releases/5_2_5.php
+ // @todo remove this when support for either IE6 or PHP < 5.2.5 is dropped.
+
+ if ($php525) {
+ return htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
+ }
+ return (preg_match('/^./us', $text) == 1) ? htmlspecialchars($text, ENT_QUOTES, 'UTF-8') : '';
}
/**
@@ -774,6 +875,7 @@
if (strlen($text) == 0) {
return TRUE;
}
+ // For performance reasons this logic is duplicated in check_plain().
return (preg_match('/^./us', $text) == 1);
}
@@ -1020,6 +1122,10 @@
// Initialize the default database.
require_once './includes/database.inc';
db_set_active();
+ // Allow specifying alternate lock implementations in settings.php, like
+ // those using APC or memcached.
+ require_once variable_get('lock_inc', './includes/lock.inc');
+ lock_init();
break;
case DRUPAL_BOOTSTRAP_ACCESS:
@@ -1060,8 +1166,6 @@
exit;
}
// Prepare for non-cached page workflow.
- require_once variable_get('lock_inc', './includes/lock.inc');
- lock_init();
drupal_page_header();
break;
@@ -1200,7 +1304,8 @@
if (!empty($reverse_proxy_addresses) && in_array($ip_address, $reverse_proxy_addresses, TRUE)) {
// If there are several arguments, we need to check the most
// recently added one, i.e. the last one.
- $ip_address = array_pop(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']));
+ $ip_address_parts = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+ $ip_address = array_pop($ip_address_parts);
}
}
}
Modified: branches/upstream/current-6/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/common.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/common.inc (original)
+++ branches/upstream/current-6/includes/common.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.756.2.79 2010/03/04 00:15:28 goba Exp $
+// $Id: common.inc,v 1.756.2.88 2010/06/02 18:52:32 goba Exp $
/**
* @file
@@ -437,8 +437,8 @@
* An integer representing how many times to retry the request in case of a
* redirect.
* @return
- * An object containing the HTTP request headers, response code, headers,
- * data and redirect status.
+ * An object containing the HTTP request headers, response code, protocol,
+ * status message, headers, data and redirect status.
*/
function drupal_http_request($url, $headers = array(), $method = 'GET', $data = NULL, $retry = 3) {
global $db_prefix;
@@ -462,6 +462,7 @@
switch ($uri['scheme']) {
case 'http':
+ case 'feed':
$port = isset($uri['port']) ? $uri['port'] : 80;
$host = $uri['host'] . ($port != 80 ? ':'. $port : '');
$fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
@@ -557,7 +558,10 @@
list($split, $result->data) = explode("\r\n\r\n", $response, 2);
$split = preg_split("/\r\n|\n|\r/", $split);
- list($protocol, $code, $text) = explode(' ', trim(array_shift($split)), 3);
+ list($protocol, $code, $status_message) = explode(' ', trim(array_shift($split)), 3);
+ $result->protocol = $protocol;
+ $result->status_message = $status_message;
+
$result->headers = array();
// Parse headers.
@@ -603,7 +607,7 @@
break;
default:
- $result->error = $text;
+ $result->error = $status_message;
}
$result->code = $code;
@@ -985,7 +989,7 @@
if ($absolute) {
return (bool)preg_match("
/^ # Start at the beginning of the text
- (?:ftp|https?):\/\/ # Look for ftp, http, or https schemes
+ (?:ftp|https?|feed):\/\/ # Look for ftp, http, https or feed schemes
(?: # Userinfo (optional) which is typically
(?:(?:[\w\.\-\+!$&'\(\)*\+,;=]|%[0-9a-f]{2})+:)* # a username or a username and password
(?:[\w\.\-\+%!$&'\(\)*\+,;=]|%[0-9a-f]{2})+@ # combination
@@ -2040,8 +2044,16 @@
$filename = $matches[1];
// Load the imported stylesheet and replace @import commands in there as well.
$file = drupal_load_stylesheet($filename);
- // Alter all url() paths, but not external.
- return preg_replace('/url\(([\'"]?)(?![a-z]+:)([^\'")]+)[\'"]?\)?;/i', 'url(\1'. dirname($filename) .'/', $file);
+ // Determine the file's directory.
+ $directory = dirname($filename);
+ // If the file is in the current directory, make sure '.' doesn't appear in
+ // the url() path.
+ $directory = $directory == '.' ? '' : $directory .'/';
+
+ // Alter all internal url() paths. Leave external paths alone. We don't need
+ // to normalize absolute paths here (i.e. remove folder/... segments) because
+ // that will be done later.
+ return preg_replace('/url\s*\(([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1'. $directory, $file);
}
/**
@@ -2408,8 +2420,8 @@
// Build aggregate JS file.
foreach ($files as $path => $info) {
if ($info['preprocess']) {
- // Append a ';' after each JS file to prevent them from running together.
- $contents .= file_get_contents($path) .';';
+ // Append a ';' and a newline after each JS file to prevent them from running together.
+ $contents .= file_get_contents($path) .";\n";
}
}
@@ -2626,13 +2638,13 @@
/**
* Store the current page in the cache.
*
- * We try to store a gzipped version of the cache. This requires the
- * PHP zlib extension (http://php.net/manual/en/ref.zlib.php).
- * Presence of the extension is checked by testing for the function
- * gzencode. There are two compression algorithms: gzip and deflate.
- * The majority of all modern browsers support gzip or both of them.
- * We thus only deal with the gzip variant and unzip the cache in case
- * the browser does not accept gzip encoding.
+ * If page_compression is enabled, a gzipped version of the page is stored in
+ * the cache to avoid compressing the output on each request. The cache entry
+ * is unzipped in the relatively rare event that the page is requested by a
+ * client without gzip support.
+ *
+ * Page compression requires the PHP zlib extension
+ * (http://php.net/manual/en/ref.zlib.php).
*
* @see drupal_page_header
*/
@@ -2642,23 +2654,11 @@
if (!$user->uid && $_SERVER['REQUEST_METHOD'] == 'GET' && page_get_cache(TRUE)) {
// This will fail in some cases, see page_get_cache() for the explanation.
if ($data = ob_get_contents()) {
- $cache = TRUE;
- if (variable_get('page_compression', TRUE) && function_exists('gzencode')) {
- // We do not store the data in case the zlib mode is deflate.
- // This should be rarely happening.
- if (zlib_get_coding_type() == 'deflate') {
- $cache = FALSE;
- }
- else if (zlib_get_coding_type() == FALSE) {
- $data = gzencode($data, 9, FORCE_GZIP);
- }
- // The remaining case is 'gzip' which means the data is
- // already compressed and nothing left to do but to store it.
+ if (variable_get('page_compression', TRUE) && extension_loaded('zlib')) {
+ $data = gzencode($data, 9, FORCE_GZIP);
}
ob_end_flush();
- if ($cache && $data) {
- cache_set($base_root . request_uri(), $data, 'cache_page', CACHE_TEMPORARY, drupal_get_headers());
- }
+ cache_set($base_root . request_uri(), $data, 'cache_page', CACHE_TEMPORARY, drupal_get_headers());
}
}
}
Modified: branches/upstream/current-6/includes/database.pgsql.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/database.pgsql.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.pgsql.inc (original)
+++ branches/upstream/current-6/includes/database.pgsql.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: database.pgsql.inc,v 1.68.2.8 2010/02/01 16:32:10 goba Exp $
+// $Id: database.pgsql.inc,v 1.68.2.9 2010/05/28 15:02:16 goba Exp $
/**
* @file
@@ -579,20 +579,16 @@
if ($spec['type'] == 'serial') {
unset($spec['not null']);
}
- if (!empty($spec['unsigned'])) {
- if ($spec['type'] == 'serial') {
- $sql .= " CHECK ($name >= 0)";
- }
- else {
- $sql .= '_unsigned';
- }
- }
if (in_array($spec['type'], array('varchar', 'char', 'text')) && isset($spec['length'])) {
$sql .= '('. $spec['length'] .')';
}
elseif (isset($spec['precision']) && isset($spec['scale'])) {
$sql .= '('. $spec['precision'] .', '. $spec['scale'] .')';
+ }
+
+ if (!empty($spec['unsigned'])) {
+ $sql .= " CHECK ($name >= 0)";
}
if (isset($spec['not null']) && $spec['not null']) {
Modified: branches/upstream/current-6/includes/file.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/file.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/file.inc (original)
+++ branches/upstream/current-6/includes/file.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: file.inc,v 1.121.2.11 2010/03/01 09:51:16 goba Exp $
+// $Id: file.inc,v 1.121.2.12 2010/05/11 09:49:58 goba Exp $
/**
* @file
@@ -195,23 +195,31 @@
}
/**
- * Copies a file to a new location. This is a powerful function that in many ways
- * performs like an advanced version of copy().
+ * Copies a file to a new location.
+ *
+ * This is a powerful function that in many ways performs like an advanced
+ * version of copy().
* - Checks if $source and $dest are valid and readable/writable.
* - Performs a file copy if $source is not equal to $dest.
* - If file already exists in $dest either the call will error out, replace the
* file or rename the file based on the $replace parameter.
*
- * @param $source A string specifying the file location of the original file.
- * This parameter will contain the resulting destination filename in case of
+ * @param $source
+ * Either a string specifying the file location of the original file or an
+ * object containing a 'filepath' property. This parameter is passed by
+ * reference and will contain the resulting destination filename in case of
* success.
- * @param $dest A string containing the directory $source should be copied to.
- * If this value is omitted, Drupal's 'files' directory will be used.
- * @param $replace Replace behavior when the destination file already exists.
- * - FILE_EXISTS_REPLACE - Replace the existing file
- * - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is unique
- * - FILE_EXISTS_ERROR - Do nothing and return FALSE.
- * @return True for success, FALSE for failure.
+ * @param $dest
+ * A string containing the directory $source should be copied to. If this
+ * value is omitted, Drupal's 'files' directory will be used.
+ * @param $replace
+ * Replace behavior when the destination file already exists.
+ * - FILE_EXISTS_REPLACE: Replace the existing file.
+ * - FILE_EXISTS_RENAME: Append _{incrementing number} until the filename is
+ * unique.
+ * - FILE_EXISTS_ERROR: Do nothing and return FALSE.
+ * @return
+ * TRUE for success, FALSE for failure.
*/
function file_copy(&$source, $dest = 0, $replace = FILE_EXISTS_RENAME) {
$dest = file_create_path($dest);
@@ -311,21 +319,28 @@
/**
* Moves a file to a new location.
+ *
* - Checks if $source and $dest are valid and readable/writable.
* - Performs a file move if $source is not equal to $dest.
* - If file already exists in $dest either the call will error out, replace the
* file or rename the file based on the $replace parameter.
*
- * @param $source A string specifying the file location of the original file.
- * This parameter will contain the resulting destination filename in case of
+ * @param $source
+ * Either a string specifying the file location of the original file or an
+ * object containing a 'filepath' property. This parameter is passed by
+ * reference and will contain the resulting destination filename in case of
* success.
- * @param $dest A string containing the directory $source should be copied to.
- * If this value is omitted, Drupal's 'files' directory will be used.
- * @param $replace Replace behavior when the destination file already exists.
- * - FILE_EXISTS_REPLACE - Replace the existing file
- * - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is unique
- * - FILE_EXISTS_ERROR - Do nothing and return FALSE.
- * @return True for success, FALSE for failure.
+ * @param $dest
+ * A string containing the directory $source should be copied to. If this
+ * value is omitted, Drupal's 'files' directory will be used.
+ * @param $replace
+ * Replace behavior when the destination file already exists.
+ * - FILE_EXISTS_REPLACE: Replace the existing file.
+ * - FILE_EXISTS_RENAME: Append _{incrementing number} until the filename is
+ * unique.
+ * - FILE_EXISTS_ERROR: Do nothing and return FALSE.
+ * @return
+ * TRUE for success, FALSE for failure.
*/
function file_move(&$source, $dest = 0, $replace = FILE_EXISTS_RENAME) {
$path_original = is_object($source) ? $source->filepath : $source;
@@ -558,7 +573,7 @@
}
// Rename potentially executable files, to help prevent exploits.
- if (preg_match('/\.(php|pl|py|cgi|asp|js)$/i', $file->filename) && (substr($file->filename, -4) != '.txt')) {
+ if (preg_match('/\.(php|pl|py|cgi|asp|js)$/i', $file->filename) && (substr($file->filename, -4) != '.txt')) {
$file->filemime = 'text/plain';
$file->filepath .= '.txt';
$file->filename .= '.txt';
Modified: branches/upstream/current-6/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/form.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/form.inc (original)
+++ branches/upstream/current-6/includes/form.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.265.2.32 2010/03/01 09:24:22 goba Exp $
+// $Id: form.inc,v 1.265.2.33 2010/05/19 15:02:32 goba Exp $
/**
* @defgroup forms Form builder functions
@@ -100,7 +100,7 @@
array_unshift($args_temp, $form_id);
$form = call_user_func_array('drupal_retrieve_form', $args_temp);
- $form_build_id = 'form-'. md5(uniqid(mt_rand(), true));
+ $form_build_id = 'form-'. md5(uniqid(mt_rand(), TRUE));
$form['#build_id'] = $form_build_id;
drupal_prepare_form($form_id, $form, $form_state);
// Store a copy of the unprocessed form for caching and indicate that it
@@ -195,7 +195,7 @@
if (!isset($form_build_id)) {
// We need a new build_id for the new version of the form.
- $form_build_id = 'form-'. md5(mt_rand());
+ $form_build_id = 'form-'. md5(uniqid(mt_rand(), TRUE));
}
$form['#build_id'] = $form_build_id;
drupal_prepare_form($form_id, $form, $form_state);
Modified: branches/upstream/current-6/includes/language.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/language.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/language.inc (original)
+++ branches/upstream/current-6/includes/language.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: language.inc,v 1.14.2.1 2009/01/02 23:37:48 dries Exp $
+// $Id: language.inc,v 1.14.2.2 2010/03/22 12:18:04 goba Exp $
/**
* @file
@@ -106,7 +106,7 @@
global $language;
// Only modify relative (insite) URLs.
- if (!$options['external']) {
+ if (empty($options['external'])) {
// Language can be passed as an option, or we go for current language.
if (!isset($options['language'])) {
Modified: branches/upstream/current-6/includes/locale.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/locale.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/locale.inc (original)
+++ branches/upstream/current-6/includes/locale.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: locale.inc,v 1.174.2.12 2010/03/04 00:15:28 goba Exp $
+// $Id: locale.inc,v 1.174.2.13 2010/05/28 13:07:27 goba Exp $
/**
* @file
@@ -1287,15 +1287,21 @@
case 'db-store':
// We got header information.
if ($value['msgid'] == '') {
- $header = _locale_import_parse_header($value['msgstr']);
-
- // Get the plural formula and update in database.
- if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
- list($nplurals, $plural) = $p;
- db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
- }
- else {
- db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", 0, '', $lang);
+ $languages = language_list();
+ if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
+ // Since we only need to parse the header if we ought to update the
+ // plural formula, only run this if we don't need to keep existing
+ // data untouched or if we don't have an existing plural formula.
+ $header = _locale_import_parse_header($value['msgstr']);
+
+ // Get the plural formula and update in database.
+ if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
+ list($nplurals, $plural) = $p;
+ db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
+ }
+ else {
+ db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", 0, '', $lang);
+ }
}
$headerdone = TRUE;
}
Modified: branches/upstream/current-6/includes/lock.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/lock.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/lock.inc (original)
+++ branches/upstream/current-6/includes/lock.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: lock.inc,v 1.1.2.2 2010/02/01 16:49:14 goba Exp $
+// $Id: lock.inc,v 1.1.2.4 2010/05/11 09:30:20 goba Exp $
/**
* @file
@@ -18,7 +18,7 @@
*
* This is a cooperative, advisory lock system. Any long-running operation
* that could potentially be attempted in parallel by multiple requests should
- * try to acquire a lock before proceeding. By obtaiing a lock, one request
+ * try to acquire a lock before proceeding. By obtaining a lock, one request
* notifies any other requests that a specific opertation is in progress which
* must not be executed in parallel.
*
@@ -52,11 +52,6 @@
*
* lock_acquire() and lock_wait() will automatically break (delete) a lock
* whose duration has exceeded the timeout specified when it was acquired.
- *
- * A function that has acquired a lock may attempt to renew a lock (extend the
- * duration of the lock) by calling lock_acquire() again during the operation.
- * Failure to renew a lock is indicative that another request has acquired
- * the lock, and that the current operation may need to be aborted.
*
* Alternative implementations of this API (such as APC) may be substituted
* by setting the 'lock_inc' variable to an alternate include filepath. Since
Modified: branches/upstream/current-6/includes/mail.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/mail.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/mail.inc (original)
+++ branches/upstream/current-6/includes/mail.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: mail.inc,v 1.8.2.7 2009/06/18 12:15:44 goba Exp $
+// $Id: mail.inc,v 1.8.2.8 2010/06/02 12:07:24 goba Exp $
/**
* Compose and optionally send an e-mail message.
@@ -475,7 +475,7 @@
if (($p = strrpos($text, "\n")) === FALSE) {
$p = -1;
}
- $n = max(0, 79 - (strlen($text) - $p));
+ $n = max(0, 79 - (strlen($text) - $p) - strlen($prefix));
// Add prefix and padding, and restore linebreak.
- return $text . $prefix . str_repeat($pad, $n - strlen($prefix)) ."\n";
-}
+ return $text . $prefix . str_repeat($pad, $n) ."\n";
+}
Modified: branches/upstream/current-6/includes/path.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/path.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/path.inc (original)
+++ branches/upstream/current-6/includes/path.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: path.inc,v 1.19.2.3 2010/03/01 09:19:15 goba Exp $
+// $Id: path.inc,v 1.19.2.4 2010/05/28 15:12:04 goba Exp $
/**
* @file
@@ -217,9 +217,15 @@
* Boolean value: TRUE if the current page is the front page; FALSE if otherwise.
*/
function drupal_is_front_page() {
- // As drupal_init_path updates $_GET['q'] with the 'site_frontpage' path,
- // we can check it against the 'site_frontpage' variable.
- return $_GET['q'] == drupal_get_normal_path(variable_get('site_frontpage', 'node'));
+ static $is_front_page;
+
+ if (!isset($is_front_page)) {
+ // As drupal_init_path updates $_GET['q'] with the 'site_frontpage' path,
+ // we can check it against the 'site_frontpage' variable.
+ $is_front_page = ($_GET['q'] == drupal_get_normal_path(variable_get('site_frontpage', 'node')));
+ }
+
+ return $is_front_page;
}
/**
Modified: branches/upstream/current-6/includes/xmlrpc.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/xmlrpc.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/xmlrpc.inc (original)
+++ branches/upstream/current-6/includes/xmlrpc.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: xmlrpc.inc,v 1.47.2.5 2009/01/14 21:36:16 goba Exp $
+// $Id: xmlrpc.inc,v 1.47.2.6 2010/06/02 12:22:02 goba Exp $
/**
* @file
@@ -157,11 +157,6 @@
* TRUE if parsing succeeded; FALSE otherwise
*/
function xmlrpc_message_parse(&$xmlrpc_message) {
- // First remove the XML declaration
- $xmlrpc_message->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $xmlrpc_message->message);
- if (trim($xmlrpc_message->message) == '') {
- return FALSE;
- }
$xmlrpc_message->_parser = xml_parser_create();
// Set XML parser to take the case of tags into account.
xml_parser_set_option($xmlrpc_message->_parser, XML_OPTION_CASE_FOLDING, FALSE);
@@ -175,7 +170,10 @@
xml_parser_free($xmlrpc_message->_parser);
// Grab the error messages, if any
$xmlrpc_message = xmlrpc_message_get();
- if ($xmlrpc_message->messagetype == 'fault') {
+ if (!isset($xmlrpc_message->messagetype)) {
+ return FALSE;
+ }
+ elseif ($xmlrpc_message->messagetype == 'fault') {
$xmlrpc_message->fault_code = $xmlrpc_message->params[0]['faultCode'];
$xmlrpc_message->fault_string = $xmlrpc_message->params[0]['faultString'];
}
Modified: branches/upstream/current-6/includes/xmlrpcs.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/xmlrpcs.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/includes/xmlrpcs.inc (original)
+++ branches/upstream/current-6/includes/xmlrpcs.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: xmlrpcs.inc,v 1.24.2.3 2009/12/07 11:36:28 goba Exp $
+// $Id: xmlrpcs.inc,v 1.24.2.4 2010/06/02 12:52:07 goba Exp $
/**
* The main entry point for XML-RPC requests.
@@ -230,7 +230,7 @@
elseif ($ok) {
$result = xmlrpc_server_call($xmlrpc_server, $method, $params);
}
- if ($result->is_error) {
+ if (is_object($result) && !empty($result->is_error)) {
$return[] = array(
'faultCode' => $result->code,
'faultString' => $result->message
Modified: branches/upstream/current-6/install.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/install.php?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/install.php (original)
+++ branches/upstream/current-6/install.php Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: install.php,v 1.113.2.10 2010/03/01 09:36:01 goba Exp $
+// $Id: install.php,v 1.113.2.12 2010/05/09 14:13:31 dries Exp $
require_once './includes/install.inc';
Modified: branches/upstream/current-6/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/aggregator/aggregator.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-6/modules/aggregator/aggregator.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/aggregator/aggregator.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/aggregator/aggregator.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/aggregator/aggregator.module (original)
+++ branches/upstream/current-6/modules/aggregator/aggregator.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: aggregator.module,v 1.374.2.5 2009/03/30 12:15:53 goba Exp $
+// $Id: aggregator.module,v 1.374.2.6 2010/05/28 16:06:59 goba Exp $
/**
* @file
@@ -640,10 +640,8 @@
watchdog('aggregator', 'There is new syndicated content from %site.', array('%site' => $feed['title']));
drupal_set_message(t('There is new syndicated content from %site.', array('%site' => $feed['title'])));
- break;
- }
- $result->error = t('feed not parseable');
- // Deliberate no break.
+ }
+ break;
default:
watchdog('aggregator', 'The feed from %site seems to be broken, due to "%error".', array('%site' => $feed['title'], '%error' => $result->code .' '. $result->error), WATCHDOG_WARNING);
drupal_set_message(t('The feed from %site seems to be broken, because of error "%error".', array('%site' => $feed['title'], '%error' => $result->code .' '. $result->error)));
Modified: branches/upstream/current-6/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/block/block.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/block/block.info (original)
+++ branches/upstream/current-6/modules/block/block.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blog/blog.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blog/blog.info (original)
+++ branches/upstream/current-6/modules/blog/blog.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blogapi/blogapi.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-6/modules/blogapi/blogapi.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/book/book.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/book/book.info (original)
+++ branches/upstream/current-6/modules/book/book.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/color/color.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/color/color.info (original)
+++ branches/upstream/current-6/modules/color/color.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/comment/comment.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.info (original)
+++ branches/upstream/current-6/modules/comment/comment.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/comment/comment.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/comment/comment.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.module (original)
+++ branches/upstream/current-6/modules/comment/comment.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: comment.module,v 1.617.2.14 2010/03/01 09:44:31 goba Exp $
+// $Id: comment.module,v 1.617.2.16 2010/05/28 16:23:15 goba Exp $
/**
* @file
@@ -949,7 +949,7 @@
if ($comment = db_fetch_object($result)) {
$comment->name = $comment->uid ? $comment->registered_name : $comment->name;
$links = module_invoke_all('link', 'comment', $comment, 1);
- drupal_alter('link', $links, $node);
+ drupal_alter('link', $links, $node, $comment);
$output .= theme('comment_view', $comment, $node, $links);
}
@@ -1744,7 +1744,7 @@
*/
function theme_comment_flat_expanded($comment, $node) {
$links = module_invoke_all('link', 'comment', $comment, 0);
- drupal_alter('link', $links, $node);
+ drupal_alter('link', $links, $node, $comment);
return theme('comment_view', $comment, $node, $links);
}
@@ -1772,7 +1772,7 @@
*/
function theme_comment_thread_expanded($comment, $node) {
$links = module_invoke_all('link', 'comment', $comment, 0);
- drupal_alter('link', $links, $node);
+ drupal_alter('link', $links, $node, $comment);
return theme('comment_view', $comment, $node, $links);
}
@@ -2033,6 +2033,14 @@
*/
function comment_action_info() {
return array(
+ 'comment_publish_action' => array(
+ 'description' => t('Publish comment'),
+ 'type' => 'comment',
+ 'configurable' => FALSE,
+ 'hooks' => array(
+ 'comment' => array('insert', 'update'),
+ ),
+ ),
'comment_unpublish_action' => array(
'description' => t('Unpublish comment'),
'type' => 'comment',
@@ -2053,12 +2061,37 @@
}
/**
- * Drupal action to unpublish a comment.
- *
+ * Action to publish a comment.
+ *
+ * @param $comment
+ * An optional comment object.
* @param $context
* Keyed array. Must contain the id of the comment if $comment is not passed.
+ *
+ * @ingroup actions
+ */
+function comment_publish_action($comment, $context = array()) {
+ if (isset($comment->cid)) {
+ $cid = $comment->cid;
+ $subject = $comment->subject;
+ }
+ else {
+ $cid = $context['cid'];
+ $subject = db_result(db_query("SELECT subject FROM {comments} WHERE cid = %d", $cid));
+ }
+ db_query('UPDATE {comments} SET status = %d WHERE cid = %d', COMMENT_PUBLISHED, $cid);
+ watchdog('action', 'Published comment %subject.', array('%subject' => $subject));
+}
+
+/**
+ * Action to unpublish a comment.
+ *
* @param $comment
* An optional comment object.
+ * @param $context
+ * Keyed array. Must contain the id of the comment if $comment is not passed.
+ *
+ * @ingroup actions
*/
function comment_unpublish_action($comment, $context = array()) {
if (isset($comment->cid)) {
@@ -2074,9 +2107,35 @@
}
/**
+ * Action to unpublish a comment if it contains a certain string.
+ *
+ * @param $comment
+ * A comment object.
+ * @param $context
+ * An array providing more information about the context of the call to this action.
+ * Unused here, since this action currently only supports the insert and update ops of
+ * the comment hook, both of which provide a complete $comment object.
+ *
+ * @ingroup actions
+ * @see comment_unpublish_by_keyword_action_form()
+ * @see comment_unpublish_by_keyword_action_submit()
+ */
+function comment_unpublish_by_keyword_action($comment, $context) {
+ foreach ($context['keywords'] as $keyword) {
+ if (strpos($comment->comment, $keyword) !== FALSE || strpos($comment->subject, $keyword) !== FALSE) {
+ db_query('UPDATE {comments} SET status = %d WHERE cid = %d', COMMENT_NOT_PUBLISHED, $comment->cid);
+ watchdog('action', 'Unpublished comment %subject.', array('%subject' => $comment->subject));
+ break;
+ }
+ }
+}
+
+/**
* Form builder; Prepare a form for blacklisted keywords.
*
* @ingroup forms
+ * @see comment_unpublish_by_keyword_action()
+ * @see comment_unpublish_by_keyword_action_submit()
*/
function comment_unpublish_by_keyword_action_form($context) {
$form['keywords'] = array(
@@ -2090,28 +2149,9 @@
/**
* Process comment_unpublish_by_keyword_action_form form submissions.
+ *
+ * @see comment_unpublish_by_keyword_action()
*/
function comment_unpublish_by_keyword_action_submit($form, $form_state) {
return array('keywords' => drupal_explode_tags($form_state['values']['keywords']));
}
-
-/**
- * Implementation of a configurable Drupal action.
- * Unpublish a comment if it contains a certain string.
- *
- * @param $context
- * An array providing more information about the context of the call to this action.
- * Unused here since this action currently only supports the insert and update ops of
- * the comment hook, both of which provide a complete $comment object.
- * @param $comment
- * A comment object.
- */
-function comment_unpublish_by_keyword_action($comment, $context) {
- foreach ($context['keywords'] as $keyword) {
- if (strstr($comment->comment, $keyword) || strstr($comment->subject, $keyword)) {
- db_query('UPDATE {comments} SET status = %d WHERE cid = %d', COMMENT_NOT_PUBLISHED, $comment->cid);
- watchdog('action', 'Unpublished comment %subject.', array('%subject' => $comment->subject));
- break;
- }
- }
-}
Modified: branches/upstream/current-6/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/contact/contact.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/contact/contact.info (original)
+++ branches/upstream/current-6/modules/contact/contact.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/dblog/dblog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/dblog/dblog.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/dblog/dblog.info (original)
+++ branches/upstream/current-6/modules/dblog/dblog.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/filter/filter.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/filter/filter.info (original)
+++ branches/upstream/current-6/modules/filter/filter.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/filter/filter.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/filter/filter.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/filter/filter.module (original)
+++ branches/upstream/current-6/modules/filter/filter.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: filter.module,v 1.204.2.10 2010/03/01 10:54:29 goba Exp $
+// $Id: filter.module,v 1.204.2.15 2010/05/28 14:40:02 goba Exp $
/**
* @file
@@ -470,18 +470,22 @@
}
/**
- * Generate a selector for choosing a format in a form.
- *
+ * Generates a selector for choosing a format in a form.
+ *
+ * @param $value
+ * The ID of the format that is currently selected; uses the default format
+ * if not provided.
+ * @param $weight
+ * The weight of the form element within the form.
+ * @param $parents
+ * The parents array of the element. Required when defining multiple text
+ * formats on a single form or having a different parent than 'format'.
+ *
+ * @return
+ * Form API array for the form element.
+ *
+ * @see filter_form_validate()
* @ingroup forms
- * @see filter_form_validate()
- * @param $value
- * The ID of the format that is currently selected.
- * @param $weight
- * The weight of the input format.
- * @param $parents
- * Required when defining multiple input formats on a single node or having a different parent than 'format'.
- * @return
- * HTML for the form element.
*/
function filter_form($value = FILTER_FORMAT_DEFAULT, $weight = NULL, $parents = array('format')) {
$value = filter_resolve_format($value);
@@ -528,6 +532,11 @@
return $form;
}
+/**
+ * Validation callback for filter elements in a form.
+ *
+ * @see filter_form().
+ */
function filter_form_validate($form) {
foreach (element_children($form) as $key) {
if ($form[$key]['#value'] == $form[$key]['#return_value']) {
@@ -774,10 +783,10 @@
}
// Properly entify angles.
- $text = preg_replace('!<([^a-zA-Z/])!', '<\1', $text);
+ $text = preg_replace('@<(?=[^a-zA-Z!/]|$)@', '<', $text);
// Split tags from text.
- $split = preg_split('/<([^>]+?)>/', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $split = preg_split('/<(!--.*?--|[^>]+?)>/s', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
// Note: PHP ensures the array consists of alternating delimiters and literals
// and begins and ends with a literal (inserting $null as required).
@@ -787,37 +796,43 @@
foreach ($split as $value) {
// Process HTML tags.
if ($tag) {
- list($tagname) = explode(' ', strtolower($value), 2);
- // Closing tag
- if ($tagname{0} == '/') {
- $tagname = substr($tagname, 1);
- // Discard XHTML closing tags for single use tags.
- if (!isset($single_use[$tagname])) {
- // See if we possibly have a matching opening tag on the stack.
- if (in_array($tagname, $stack)) {
- // Close other tags lingering first.
- do {
- $output .= '</'. $stack[0] .'>';
- } while (array_shift($stack) != $tagname);
+ // Passthrough comments.
+ if (substr($value, 0, 3) == '!--') {
+ $output .= '<'. $value .'>';
+ }
+ else {
+ list($tagname) = preg_split('/\s/', strtolower($value), 2);
+ // Closing tag
+ if ($tagname{0} == '/') {
+ $tagname = substr($tagname, 1);
+ // Discard XHTML closing tags for single use tags.
+ if (!isset($single_use[$tagname])) {
+ // See if we possibly have a matching opening tag on the stack.
+ if (in_array($tagname, $stack)) {
+ // Close other tags lingering first.
+ do {
+ $output .= '</'. $stack[0] .'>';
+ } while (array_shift($stack) != $tagname);
+ }
+ // Otherwise, discard it.
}
- // Otherwise, discard it.
}
- }
- // Opening tag
- else {
- // See if we have an identical 'no nesting' tag already open and close it if found.
- if (count($stack) && ($stack[0] == $tagname) && isset($no_nesting[$stack[0]])) {
- $output .= '</'. array_shift($stack) .'>';
+ // Opening tag
+ else {
+ // See if we have an identical 'no nesting' tag already open and close it if found.
+ if (count($stack) && ($stack[0] == $tagname) && isset($no_nesting[$stack[0]])) {
+ $output .= '</'. array_shift($stack) .'>';
+ }
+ // Push non-single-use tags onto the stack
+ if (!isset($single_use[$tagname])) {
+ array_unshift($stack, $tagname);
+ }
+ // Add trailing slash to single-use tags as per X(HT)ML.
+ else {
+ $value = rtrim($value, ' /') .' /';
+ }
+ $output .= '<'. $value .'>';
}
- // Push non-single-use tags onto the stack
- if (!isset($single_use[$tagname])) {
- array_unshift($stack, $tagname);
- }
- // Add trailing slash to single-use tags as per X(HT)ML.
- else {
- $value = rtrim($value, ' /') .' /';
- }
- $output .= '<'. $value .'>';
}
}
else {
@@ -882,7 +897,7 @@
// We don't apply any processing to the contents of these tags to avoid messing
// up code. We look for matched pairs and allow basic nesting. For example:
// "processed <pre> ignored <script> ignored </script> ignored </pre> processed"
- $chunks = preg_split('@(</?(?:pre|script|style|object)[^>]*>)@i', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $chunks = preg_split('@(<(?:!--.*?--|/?(?:pre|script|style|object)[^>]*)>)@si', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
// Note: PHP ensures the array consists of alternating delimiters and literals
// and begins and ends with a literal (inserting NULL as required).
$ignore = FALSE;
@@ -890,19 +905,25 @@
$output = '';
foreach ($chunks as $i => $chunk) {
if ($i % 2) {
- // Opening or closing tag?
- $open = ($chunk[1] != '/');
- list($tag) = split('[ >]', substr($chunk, 2 - $open), 2);
- if (!$ignore) {
- if ($open) {
- $ignore = TRUE;
- $ignoretag = $tag;
+ // Passthrough comments.
+ if (substr($chunk, 1, 3) == '!--') {
+ $output .= $chunk;
+ }
+ else {
+ // Opening or closing tag?
+ $open = ($chunk[1] != '/');
+ list($tag) = split('[ >]', substr($chunk, 2 - $open), 2);
+ if (!$ignore) {
+ if ($open) {
+ $ignore = TRUE;
+ $ignoretag = $tag;
+ }
}
- }
- // Only allow a matching tag to close it.
- else if (!$open && $ignoretag == $tag) {
- $ignore = FALSE;
- $ignoretag = '';
+ // Only allow a matching tag to close it.
+ else if (!$open && $ignoretag == $tag) {
+ $ignore = FALSE;
+ $ignoretag = '';
+ }
}
}
else if (!$ignore) {
@@ -911,7 +932,8 @@
$chunk = preg_replace('!(<'. $block .'[^>]*>)!', "\n$1", $chunk); // Space things out a little
$chunk = preg_replace('!(</'. $block .'>)!', "$1\n\n", $chunk); // Space things out a little
$chunk = preg_replace("/\n\n+/", "\n\n", $chunk); // take care of duplicates
- $chunk = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "<p>$1</p>\n", $chunk); // make paragraphs, including one at the end
+ $chunk = preg_replace('/^\n|\n\s*\n$/', '', $chunk);
+ $chunk = '<p>'. preg_replace('/\n\s*\n\n?(.)/', "</p>\n<p>$1", $chunk) ."</p>\n"; // make paragraphs, including one at the end
$chunk = preg_replace("|<p>(<li.+?)</p>|", "$1", $chunk); // problem with nested lists
$chunk = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $chunk);
$chunk = str_replace('</blockquote></p>', '</p></blockquote>', $chunk);
@@ -988,6 +1010,8 @@
(
<(?=[^a-zA-Z!/]) # a lone <
| # or
+ <!--.*?--> # a comment
+ | # or
<[^>]*(>|$) # a string that starts with a <, up until the > or the end of the string
| # or
> # just a >
@@ -1026,7 +1050,7 @@
return '<';
}
- if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+ if (!preg_match('%^(?:<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?|(<!--.*?-->))$%', $string, $matches)) {
// Seriously malformed
return '';
}
@@ -1034,10 +1058,19 @@
$slash = trim($matches[1]);
$elem = &$matches[2];
$attrlist = &$matches[3];
+ $comment = &$matches[4];
+
+ if ($comment) {
+ $elem = '!--';
+ }
if (!isset($allowed_html[strtolower($elem)])) {
// Disallowed HTML element
return '';
+ }
+
+ if ($comment) {
+ return $comment;
}
if ($slash != '') {
Modified: branches/upstream/current-6/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/forum/forum.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.info (original)
+++ branches/upstream/current-6/modules/forum/forum.info Sun Jun 6 20:30:52 2010
@@ -7,8 +7,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/help/help.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/help/help.info (original)
+++ branches/upstream/current-6/modules/help/help.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/locale/locale.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/locale/locale.info (original)
+++ branches/upstream/current-6/modules/locale/locale.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/menu/menu.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/menu/menu.admin.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/menu/menu.admin.inc (original)
+++ branches/upstream/current-6/modules/menu/menu.admin.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.admin.inc,v 1.26.2.6 2009/12/16 20:47:10 goba Exp $
+// $Id: menu.admin.inc,v 1.26.2.7 2010/06/02 12:56:20 goba Exp $
/**
* @file
@@ -344,8 +344,16 @@
if (isset($parsed_link['query'])) {
$item['options']['query'] = $parsed_link['query'];
}
+ else {
+ // Use unset() rather than setting to empty string
+ // to avoid redundant serialized data being stored.
+ unset($item['options']['query']);
+ }
if (isset($parsed_link['fragment'])) {
$item['options']['fragment'] = $parsed_link['fragment'];
+ }
+ else {
+ unset($item['options']['fragment']);
}
if ($item['link_path'] != $parsed_link['path']) {
$item['link_path'] = $parsed_link['path'];
Modified: branches/upstream/current-6/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/menu/menu.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/menu/menu.info (original)
+++ branches/upstream/current-6/modules/menu/menu.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/node/node.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.info (original)
+++ branches/upstream/current-6/modules/node/node.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/node/node.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/node/node.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.module (original)
+++ branches/upstream/current-6/modules/node/node.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: node.module,v 1.947.2.22 2010/03/03 21:36:37 goba Exp $
+// $Id: node.module,v 1.947.2.24 2010/06/02 12:11:07 goba Exp $
/**
* @file
@@ -1285,9 +1285,13 @@
$node->body = drupal_render($node->content);
// Fetch comments for snippet.
- $node->body .= module_invoke('comment', 'nodeapi', $node, 'update index');
+ if (module_exists('comment')) {
+ $node->body .= comment_nodeapi($node, 'update index');
+ }
// Fetch terms for snippet.
- $node->body .= module_invoke('taxonomy', 'nodeapi', $node, 'update index');
+ if (module_exists('taxonomy')) {
+ $node->body .= taxonomy_nodeapi($node, 'update index');
+ }
$extra = node_invoke_nodeapi($node, 'search result');
$results[] = array(
@@ -2376,7 +2380,7 @@
node_access_acquire_grants($loaded_node);
}
$context['sandbox']['progress']++;
- $context['sandbox']['current_node'] = $loaded_node->nid;
+ $context['sandbox']['current_node'] = $row['nid'];
}
// Multistep processing : report progress.
Modified: branches/upstream/current-6/modules/openid/openid.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/openid/openid.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/openid/openid.info (original)
+++ branches/upstream/current-6/modules/openid/openid.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/path/path.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/path/path.info (original)
+++ branches/upstream/current-6/modules/path/path.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/php/php.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/php/php.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/php/php.info (original)
+++ branches/upstream/current-6/modules/php/php.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/ping/ping.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/ping/ping.info (original)
+++ branches/upstream/current-6/modules/ping/ping.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/poll/poll.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/poll/poll.info (original)
+++ branches/upstream/current-6/modules/poll/poll.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/poll/poll.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/poll/poll.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/poll/poll.module (original)
+++ branches/upstream/current-6/modules/poll/poll.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: poll.module,v 1.263.2.4 2009/09/14 10:16:54 goba Exp $
+// $Id: poll.module,v 1.263.2.5 2010/05/11 12:40:43 goba Exp $
/**
* @file
@@ -294,8 +294,6 @@
}
function _poll_choice_form($delta, $value = '', $votes = 0) {
- $admin = user_access('administer nodes');
-
$form = array(
'#tree' => TRUE,
);
@@ -308,17 +306,15 @@
'#default_value' => $value,
'#parents' => array('choice', $delta, 'chtext'),
);
-
- if ($admin) {
- $form['chvotes'] = array(
- '#type' => 'textfield',
- '#title' => t('Votes for choice @n', array('@n' => ($delta + 1))),
- '#default_value' => $votes,
- '#size' => 5,
- '#maxlength' => 7,
- '#parents' => array('choice', $delta, 'chvotes'),
- );
- }
+ $form['chvotes'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Votes for choice @n', array('@n' => ($delta + 1))),
+ '#default_value' => $votes,
+ '#size' => 5,
+ '#maxlength' => 7,
+ '#parents' => array('choice', $delta, 'chvotes'),
+ '#access' => user_access('administer nodes'),
+ );
return $form;
}
Modified: branches/upstream/current-6/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/profile/profile.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/profile/profile.info (original)
+++ branches/upstream/current-6/modules/profile/profile.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/search/search.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.info (original)
+++ branches/upstream/current-6/modules/search/search.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/search/search.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/search/search.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.module (original)
+++ branches/upstream/current-6/modules/search/search.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: search.module,v 1.250.2.8 2009/12/07 15:44:33 goba Exp $
+// $Id: search.module,v 1.250.2.10 2010/05/28 15:20:35 goba Exp $
/**
* @file
@@ -42,11 +42,11 @@
'\x{2108}\x{2109}\x{2114}\x{2116}-\x{2118}\x{211e}-\x{2123}\x{2125}\x{2127}'.
'\x{2129}\x{212e}\x{2132}\x{213a}\x{213b}\x{2140}-\x{2144}\x{214a}-\x{2b13}'.
'\x{2ce5}-\x{2cff}\x{2d6f}\x{2e00}-\x{3005}\x{3007}-\x{303b}\x{303d}-\x{303f}'.
-'\x{3099}-\x{309e}\x{30a0}\x{30fb}-\x{30fe}\x{3190}-\x{319f}\x{31c0}-\x{31cf}'.
-'\x{3200}-\x{33ff}\x{4dc0}-\x{4dff}\x{a015}\x{a490}-\x{a716}\x{a802}\x{a806}'.
-'\x{a80b}\x{a823}-\x{a82b}\x{d800}-\x{f8ff}\x{fb1e}\x{fb29}\x{fd3e}\x{fd3f}'.
-'\x{fdfc}-\x{fe6b}\x{feff}-\x{ff0f}\x{ff1a}-\x{ff20}\x{ff3b}-\x{ff40}\x{ff5b}-'.
-'\x{ff65}\x{ff70}\x{ff9e}\x{ff9f}\x{ffe0}-\x{fffd}');
+'\x{3099}-\x{309e}\x{30a0}\x{30fb}\x{30fd}\x{30fe}\x{3190}-\x{319f}\x{31c0}-'.
+'\x{31cf}\x{3200}-\x{33ff}\x{4dc0}-\x{4dff}\x{a015}\x{a490}-\x{a716}\x{a802}'.
+'\x{a806}\x{a80b}\x{a823}-\x{a82b}\x{d800}-\x{f8ff}\x{fb1e}\x{fb29}\x{fd3e}'.
+'\x{fd3f}\x{fdfc}-\x{fe6b}\x{feff}-\x{ff0f}\x{ff1a}-\x{ff20}\x{ff3b}-\x{ff40}'.
+'\x{ff5b}-\x{ff65}\x{ff70}\x{ff9e}\x{ff9f}\x{ffe0}-\x{fffd}');
/**
* Matches all 'N' Unicode character classes (numbers)
@@ -287,7 +287,7 @@
$total = log10(1 + 1/(max(1, $total)));
db_query("UPDATE {search_total} SET count = %f WHERE word = '%s'", $total, $word);
if (!db_affected_rows()) {
- db_query("INSERT INTO {search_total} (word, count) VALUES ('%s', %f)", $word, $total);
+ @db_query("INSERT INTO {search_total} (word, count) VALUES ('%s', %f)", $word, $total);
}
}
// Find words that were deleted from search_index, but are still in
Modified: branches/upstream/current-6/modules/statistics/statistics.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/statistics/statistics.admin.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/statistics/statistics.admin.inc (original)
+++ branches/upstream/current-6/modules/statistics/statistics.admin.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: statistics.admin.inc,v 1.6 2008/01/08 10:35:42 goba Exp $
+// $Id: statistics.admin.inc,v 1.6.2.2 2010/06/02 12:14:48 goba Exp $
/**
* @file
@@ -83,7 +83,7 @@
);
$sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name, a.hostname, SUM(a.timer) AS total, ac.aid FROM {accesslog} a LEFT JOIN {access} ac ON ac.type = 'host' AND LOWER(a.hostname) LIKE (ac.mask) LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.hostname, a.uid, u.name, ac.aid". tablesort_sql($header);
- $sql_cnt = "SELECT COUNT(DISTINCT(CONCAT(uid, hostname))) FROM {accesslog}";
+ $sql_cnt = "SELECT COUNT(*) FROM (SELECT DISTINCT uid, hostname FROM {accesslog}) AS unique_visits";
$result = pager_query($sql, 30, 0, $sql_cnt);
$rows = array();
@@ -192,7 +192,7 @@
'#default_value' => variable_get('statistics_enable_access_log', 0),
'#options' => $options,
'#description' => t('Log each page access. Required for referrer statistics.'));
- $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
+ $period = array('0' => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
$form['access']['statistics_flush_accesslog_timer'] = array(
'#type' => 'select',
'#title' => t('Discard access logs older than'),
Modified: branches/upstream/current-6/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/statistics/statistics.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/statistics/statistics.info (original)
+++ branches/upstream/current-6/modules/statistics/statistics.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/statistics/statistics.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/statistics/statistics.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/statistics/statistics.module (original)
+++ branches/upstream/current-6/modules/statistics/statistics.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: statistics.module,v 1.272.2.1 2009/04/27 12:25:24 goba Exp $
+// $Id: statistics.module,v 1.272.2.2 2010/06/02 12:14:48 goba Exp $
/**
* @file
@@ -186,7 +186,9 @@
}
// Clean up expired access logs.
- db_query('DELETE FROM {accesslog} WHERE timestamp < %d', time() - variable_get('statistics_flush_accesslog_timer', 259200));
+ if (variable_get('statistics_flush_accesslog_timer', 259200) > 0) {
+ db_query('DELETE FROM {accesslog} WHERE timestamp < %d', time() - variable_get('statistics_flush_accesslog_timer', 259200));
+ }
}
/**
Modified: branches/upstream/current-6/modules/syslog/syslog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/syslog/syslog.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/syslog/syslog.info (original)
+++ branches/upstream/current-6/modules/syslog/syslog.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.info (original)
+++ branches/upstream/current-6/modules/system/system.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/system/system.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.install?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.install (original)
+++ branches/upstream/current-6/modules/system/system.install Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: system.install,v 1.238.2.22 2010/03/01 16:53:57 goba Exp $
+// $Id: system.install,v 1.238.2.23 2010/05/28 11:51:20 goba Exp $
/**
* Test and report Drupal installation requirements.
@@ -371,24 +371,42 @@
// anonymous user. uid is 1 here for now, but very soon it will be changed
// to 0.
db_query("INSERT INTO {users} (name, mail) VALUES('%s', '%s')", '', '');
+
// We need some placeholders here as name and mail are uniques and data is
// presumed to be a serialized array. Install will change uid 1 immediately
// anyways. So we insert the superuser here, the uid is 2 here for now, but
// very soon it will be changed to 1.
db_query("INSERT INTO {users} (name, mail, created, data) VALUES('%s', '%s', %d, '%s')", 'placeholder-for-uid-1', 'placeholder-for-uid-1', time(), serialize(array()));
+
// This sets the above two users uid 0 (anonymous). We avoid an explicit 0
// otherwise MySQL might insert the next auto_increment value.
db_query("UPDATE {users} SET uid = uid - uid WHERE name = '%s'", '');
+
// This sets uid 1 (superuser). We skip uid 2 but that's not a big problem.
db_query("UPDATE {users} SET uid = 1 WHERE name = '%s'", 'placeholder-for-uid-1');
db_query("INSERT INTO {role} (name) VALUES ('%s')", 'anonymous user');
+ $rid_anonymous = db_last_insert_id('role', 'rid');
+
db_query("INSERT INTO {role} (name) VALUES ('%s')", 'authenticated user');
-
- db_query("INSERT INTO {permission} (rid, perm, tid) VALUES (%d, '%s', %d)", 1, 'access content', 0);
- db_query("INSERT INTO {permission} (rid, perm, tid) VALUES (%d, '%s', %d)", 2, 'access comments, access content, post comments, post comments without approval', 0);
+ $rid_authenticated = db_last_insert_id('role', 'rid');
+
+ // Sanity check to ensure the anonymous and authenticated role IDs are the
+ // same as the drupal defined constants. In certain situations, this will
+ // not be true
+ if ($rid_anonymous != DRUPAL_ANONYMOUS_RID) {
+ db_query("UPDATE {role} SET rid = %d WHERE rid = %d", DRUPAL_ANONYMOUS_RID, $rid_anonymous);
+ }
+
+ if ($rid_authenticated != DRUPAL_AUTHENTICATED_RID) {
+ db_query("UPDATE {role} SET rid = %d WHERE rid = %d", DRUPAL_AUTHENTICATED_RID, $rid_authenticated);
+ }
+
+ db_query("INSERT INTO {permission} (rid, perm, tid) VALUES (%d, '%s', %d)", DRUPAL_ANONYMOUS_RID, 'access content', 0);
+ db_query("INSERT INTO {permission} (rid, perm, tid) VALUES (%d, '%s', %d)", DRUPAL_AUTHENTICATED_RID, 'access comments, access content, post comments, post comments without approval', 0);
db_query("INSERT INTO {variable} (name, value) VALUES ('%s', '%s')", 'theme_default', 's:7:"garland";');
+
db_query("UPDATE {system} SET status = %d WHERE type = '%s' AND name = '%s'", 1, 'theme', 'garland');
db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', '0', 'garland', 1, 0, 'left', '', -1);
db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', '1', 'garland', 1, 0, 'left', '', -1);
@@ -397,31 +415,32 @@
db_query("INSERT INTO {node_access} (nid, gid, realm, grant_view, grant_update, grant_delete) VALUES (%d, %d, '%s', %d, %d, %d)", 0, 0, 'all', 1, 0, 0);
// Add input formats.
- db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Filtered HTML', ',1,2,', 1);
+ db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Filtered HTML', ',' . DRUPAL_ANONYMOUS_RID . ',' . DRUPAL_AUTHENTICATED_RID . ',', 1);
+ $filtered_html_format = db_last_insert_id('filter_formats', 'format');
db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('%s', '%s', %d)", 'Full HTML', '', 1);
+ $full_html_format = db_last_insert_id('filter_formats', 'format');
// Enable filters for each input format.
// Filtered HTML:
// URL filter.
- db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 1, 'filter', 2, 0);
+ db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $filtered_html_format, 'filter', 2, 0);
// HTML filter.
- db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 1, 'filter', 0, 1);
+ db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $filtered_html_format, 'filter', 0, 1);
// Line break filter.
- db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 1, 'filter', 1, 2);
+ db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $filtered_html_format, 'filter', 1, 2);
// HTML corrector filter.
- db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 1, 'filter', 3, 10);
+ db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $filtered_html_format, 'filter', 3, 10);
// Full HTML:
// URL filter.
- db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 2, 'filter', 2, 0);
+ db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $full_html_format, 'filter', 2, 0);
// Line break filter.
- db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 2, 'filter', 1, 1);
+ db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $full_html_format, 'filter', 1, 1);
// HTML corrector filter.
- db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", 2, 'filter', 3, 10);
+ db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $full_html_format, 'filter', 3, 10);
db_query("INSERT INTO {variable} (name, value) VALUES ('%s','%s')", 'filter_html_1', 'i:1;');
-
db_query("INSERT INTO {variable} (name, value) VALUES ('%s', '%s')", 'node_options_forum', 'a:1:{i:0;s:6:"status";}');
}
Modified: branches/upstream/current-6/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.module (original)
+++ branches/upstream/current-6/modules/system/system.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: system.module,v 1.585.2.49 2010/03/04 00:15:28 goba Exp $
+// $Id: system.module,v 1.585.2.52 2010/06/02 18:52:32 goba Exp $
/**
* @file
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.16');
+define('VERSION', '6.17');
/**
* Core API compatibility.
@@ -1148,36 +1148,46 @@
}
/**
- * Output a confirmation form
- *
- * This function returns a complete form for confirming an action. A link is
- * offered to go back to the item that is being changed in case the user changes
- * his/her mind.
- *
- * If the submit handler for this form is invoked, the user successfully
- * confirmed the action. You should never directly inspect $_POST to see if an
- * action was confirmed.
- *
- * @ingroup forms
+ * Generates a form array for a confirmation form.
+ *
+ * This function returns a complete form array for confirming an action. The
+ * form contains a confirm button as well as a cancellation link that allows a
+ * user to abort the action.
+ *
+ * If the submit handler for a form that implements confirm_form() is invoked,
+ * the user successfully confirmed the action. You should never directly
+ * inspect $_POST to see if an action was confirmed.
+ *
+ * Note - if the parameters $question, $description, $yes, or $no could contain
+ * any user input (such as node titles or taxonomy terms), it is the
+ * responsibility of the code calling confirm_form() to sanitize them first with
+ * a function like check_plain() or filter_xss().
+ *
* @param $form
- * Additional elements to inject into the form, for example hidden elements.
+ * Additional elements to add to the form; for example, hidden elements.
* @param $question
* The question to ask the user (e.g. "Are you sure you want to delete the
- * block <em>foo</em>?").
+ * block <em>foo</em>?"). The page title will be set to this value.
* @param $path
- * The page to go to if the user denies the action.
- * Can be either a drupal path, or an array with the keys 'path', 'query', 'fragment'.
+ * The page to go to if the user cancels the action. This can be either:
+ * - A string containing a Drupal path.
+ * - An associative array with a 'path' key. Additional array values are
+ * passed as the $options parameter to l().
+ * If the 'destination' query parameter is set in the URL when viewing a
+ * confirmation form, that value will be used instead of $path.
* @param $description
- * Additional text to display (defaults to "This action cannot be undone.").
+ * Additional text to display. Defaults to t('This action cannot be undone.').
* @param $yes
- * A caption for the button which confirms the action (e.g. "Delete",
- * "Replace", ...).
+ * A caption for the button that confirms the action (e.g. "Delete",
+ * "Replace", ...). Defaults to t('Confirm').
* @param $no
- * A caption for the link which denies the action (e.g. "Cancel").
+ * A caption for the link which cancels the action (e.g. "Cancel"). Defaults
+ * to t('Cancel').
* @param $name
* The internal name used to refer to the confirmation item.
+ *
* @return
- * The form.
+ * The form array.
*/
function confirm_form($form, $question, $path, $description = NULL, $yes = NULL, $no = NULL, $name = 'confirm') {
$description = isset($description) ? $description : t('This action cannot be undone.');
Modified: branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.admin.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.admin.inc,v 1.22.2.3 2009/02/25 12:53:24 goba Exp $
+// $Id: taxonomy.admin.inc,v 1.22.2.4 2010/05/28 16:16:45 goba Exp $
/**
* @file
@@ -919,7 +919,7 @@
* @see taxonomy_vocabulary_confirm_reset_alphabetical()
*/
function taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, &$form_state) {
- db_query('UPDATE {term_data} t SET weight = 0 WHERE vid = %d', $form_state['values']['vid']);
+ db_query('UPDATE {term_data} SET weight = 0 WHERE vid = %d', $form_state['values']['vid']);
drupal_set_message(t('Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name'])));
watchdog('taxonomy', 'Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/content/taxonomy/'. $form_state['values']['vid'];
Modified: branches/upstream/current-6/modules/taxonomy/taxonomy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/taxonomy/taxonomy.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/taxonomy/taxonomy.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/taxonomy/taxonomy.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.module (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.module,v 1.414.2.13 2010/03/01 10:08:21 goba Exp $
+// $Id: taxonomy.module,v 1.414.2.14 2010/05/11 10:19:04 goba Exp $
/**
* @file
@@ -14,7 +14,7 @@
}
/**
- * Implementation of hook_theme()
+ * Implementation of hook_theme().
*/
function taxonomy_theme() {
return array(
@@ -412,6 +412,21 @@
/**
* Generate a form element for selecting terms from a vocabulary.
+ *
+ * @param $vid
+ * The vocabulary ID to generate a form element for.
+ * @param $value
+ * The existing value of the term(s) in this vocabulary to use by default.
+ * @param $help
+ * Optional help text to use for the form element. If specified, this value
+ * MUST be properly sanitized and filtered (e.g. with filter_xss_admin() or
+ * check_plain() if it is user-supplied) to prevent XSS vulnerabilities. If
+ * omitted, the help text stored with the vocaulary (if any) will be used.
+ * @return
+ * An array describing a form element to select terms for a vocabulary.
+ *
+ * @see _taxonomy_term_select()
+ * @see filter_xss_admin()
*/
function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
$vocabulary = taxonomy_vocabulary_load($vid);
Modified: branches/upstream/current-6/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/throttle/throttle.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/throttle/throttle.info (original)
+++ branches/upstream/current-6/modules/throttle/throttle.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/tracker/tracker.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/tracker/tracker.info (original)
+++ branches/upstream/current-6/modules/tracker/tracker.info Sun Jun 6 20:30:52 2010
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/translation/translation.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/translation/translation.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/translation/translation.info (original)
+++ branches/upstream/current-6/modules/translation/translation.info Sun Jun 6 20:30:52 2010
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/trigger/trigger.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/trigger/trigger.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/trigger/trigger.info (original)
+++ branches/upstream/current-6/modules/trigger/trigger.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/update/update.compare.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.compare.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.compare.inc (original)
+++ branches/upstream/current-6/modules/update/update.compare.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: update.compare.inc,v 1.8.2.8 2010/03/01 09:40:45 goba Exp $
+// $Id: update.compare.inc,v 1.8.2.9 2010/03/05 09:10:49 goba Exp $
/**
* @file
@@ -690,7 +690,13 @@
'package',
'project',
'project status url',
- 'version',
+ 'version',
);
- return array_intersect_key($info, drupal_map_assoc($whitelist));
+ $whitelist = array_flip($whitelist);
+ foreach ($info as $key => $value) {
+ if (!isset($whitelist[$key])) {
+ unset($info[$key]);
+ }
+ }
+ return $info;
}
Modified: branches/upstream/current-6/modules/update/update.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.info (original)
+++ branches/upstream/current-6/modules/update/update.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/update/update.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.install?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.install (original)
+++ branches/upstream/current-6/modules/update/update.install Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: update.install,v 1.4.2.2 2009/01/06 15:46:38 goba Exp $
+// $Id: update.install,v 1.4.2.3 2010/05/19 15:03:58 goba Exp $
/**
* Implementation of hook_install().
@@ -28,7 +28,6 @@
foreach ($variables as $variable) {
variable_del($variable);
}
- menu_rebuild();
}
/**
Modified: branches/upstream/current-6/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/upload/upload.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/upload/upload.info (original)
+++ branches/upstream/current-6/modules/upload/upload.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/upload/upload.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/upload/upload.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/upload/upload.module (original)
+++ branches/upstream/current-6/modules/upload/upload.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: upload.module,v 1.197.2.5 2009/09/16 17:54:19 goba Exp $
+// $Id: upload.module,v 1.197.2.6 2010/05/19 14:43:56 goba Exp $
/**
* @file
@@ -189,6 +189,9 @@
if (isset($form_state['values']['files'])) {
foreach ($form_state['values']['files'] as $fid => $file) {
+ // If the node was previewed prior to saving, $form['#node']->files[$fid]
+ // is an array instead of an object. Convert file to object for compatibility.
+ $form['#node']->files[$fid] = (object) $form['#node']->files[$fid];
$form_state['values']['files'][$fid]['new'] = !empty($form['#node']->files[$fid]->new);
}
}
Modified: branches/upstream/current-6/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.info (original)
+++ branches/upstream/current-6/modules/user/user.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/modules/user/user.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.module?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.module (original)
+++ branches/upstream/current-6/modules/user/user.module Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.892.2.20 2010/03/01 11:42:50 goba Exp $
+// $Id: user.module,v 1.892.2.25 2010/06/02 12:47:58 goba Exp $
/**
* @file
@@ -378,11 +378,21 @@
* Verify the syntax of the given name.
*/
function user_validate_name($name) {
- if (!strlen($name)) return t('You must enter a username.');
- if (substr($name, 0, 1) == ' ') return t('The username cannot begin with a space.');
- if (substr($name, -1) == ' ') return t('The username cannot end with a space.');
- if (strpos($name, ' ') !== FALSE) return t('The username cannot contain multiple spaces in a row.');
- if (ereg("[^\x80-\xF7 [:alnum:]@_.-]", $name)) return t('The username contains an illegal character.');
+ if (!strlen($name)) {
+ return t('You must enter a username.');
+ }
+ if (substr($name, 0, 1) == ' ') {
+ return t('The username cannot begin with a space.');
+ }
+ if (substr($name, -1) == ' ') {
+ return t('The username cannot end with a space.');
+ }
+ if (strpos($name, ' ') !== FALSE) {
+ return t('The username cannot contain multiple spaces in a row.');
+ }
+ if (preg_match('/[^\x{80}-\x{F7} a-z0-9 at _.\'-]/i', $name)) {
+ return t('The username contains an illegal character.');
+ }
if (preg_match('/[\x{80}-\x{A0}'. // Non-printable ISO-8859-1 + NBSP
'\x{AD}'. // Soft-hyphen
'\x{2000}-\x{200F}'. // Various space characters
@@ -391,12 +401,13 @@
'\x{FEFF}'. // Byte order mark
'\x{FF01}-\x{FF60}'. // Full-width latin
'\x{FFF9}-\x{FFFD}'. // Replacement characters
- '\x{0}]/u', // NULL byte
+ '\x{0}-\x{1F}]/u', // NULL byte and control characters
$name)) {
return t('The username contains an illegal character.');
}
- if (strpos($name, '@') !== FALSE && !eregi('@([0-9a-z](-?[0-9a-z])*.)+[a-z]{2}([zmuvtg]|fo|me)?$', $name)) return t('The username is not a valid authentication ID.');
- if (strlen($name) > USERNAME_MAX_LENGTH) return t('The username %name is too long: it must be %max characters or less.', array('%name' => $name, '%max' => USERNAME_MAX_LENGTH));
+ if (drupal_strlen($name) > USERNAME_MAX_LENGTH) {
+ return t('The username %name is too long: it must be %max characters or less.', array('%name' => $name, '%max' => USERNAME_MAX_LENGTH));
+ }
}
function user_validate_mail($mail) {
@@ -1154,7 +1165,7 @@
$accounts[$uid] = user_load($uid);
}
$valid = TRUE;
- if ($account = $accounts[$uid]) {
+ if (($account = $accounts[$uid]) && isset($map[$index + 1]) && $map[$index + 1] == 'edit') {
// Since the path is like user/%/edit/category_name, the category name will
// be at a position 2 beyond the index corresponding to the % wildcard.
$category_index = $index + 2;
@@ -1239,7 +1250,7 @@
if ($value) {
db_query("UPDATE {authmap} SET authname = '%s' WHERE uid = %d AND module = '%s'", $value, $account->uid, $module[1]);
if (!db_affected_rows()) {
- db_query("INSERT INTO {authmap} (authname, uid, module) VALUES ('%s', %d, '%s')", $value, $account->uid, $module[1]);
+ @db_query("INSERT INTO {authmap} (authname, uid, module) VALUES ('%s', %d, '%s')", $value, $account->uid, $module[1]);
}
}
else {
@@ -1335,7 +1346,6 @@
global $user;
if (!$user->uid) {
form_set_error('name', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password'))));
- watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name']));
}
}
@@ -1367,6 +1377,9 @@
$user = $account;
user_authenticate_finalize($form_values);
return $user;
+ }
+ else {
+ watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_values['name']));
}
}
@@ -1439,6 +1452,16 @@
}
}
+/**
+ * Generates a unique URL for a user to login and reset their password.
+ *
+ * @param object $account
+ * An object containing the user account.
+ *
+ * @return
+ * A unique URL that provides a one-time log in for the user, from which
+ * they can change their password.
+ */
function user_pass_reset_url($account) {
$timestamp = time();
return url("user/reset/$account->uid/$timestamp/". user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE));
Modified: branches/upstream/current-6/modules/user/user.pages.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.pages.inc?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.pages.inc (original)
+++ branches/upstream/current-6/modules/user/user.pages.inc Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: user.pages.inc,v 1.11.2.2 2009/09/16 17:54:20 goba Exp $
+// $Id: user.pages.inc,v 1.11.2.3 2010/06/02 12:03:07 goba Exp $
/**
* @file
@@ -44,17 +44,19 @@
function user_pass_validate($form, &$form_state) {
$name = trim($form_state['values']['name']);
- // Blocked accounts cannot request a new password,
- // check provided username and email against access rules.
- if (drupal_is_denied('user', $name) || drupal_is_denied('mail', $name)) {
- form_set_error('name', t('%name is not allowed to request a new password.', array('%name' => $name)));
- }
// Try to load by email.
$account = user_load(array('mail' => $name, 'status' => 1));
if (!$account) {
// No success, try to load by name.
$account = user_load(array('name' => $name, 'status' => 1));
+ }
+ if ($account) {
+ // Blocked accounts cannot request a new password,
+ // check provided username and email against access rules.
+ if (drupal_is_denied('user', $account->name) || drupal_is_denied('mail', $account->mail)) {
+ form_set_error('name', t('%name is not allowed to request a new password.', array('%name' => $name)));
+ }
}
if (isset($account->uid)) {
form_set_value(array('#parents' => array('account')), $account, $form_state);
Modified: branches/upstream/current-6/themes/bluemarine/bluemarine.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/bluemarine/bluemarine.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/themes/bluemarine/bluemarine.info (original)
+++ branches/upstream/current-6/themes/bluemarine/bluemarine.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/themes/chameleon/chameleon.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/chameleon/chameleon.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/chameleon.info (original)
+++ branches/upstream/current-6/themes/chameleon/chameleon.info Sun Jun 6 20:30:52 2010
@@ -12,8 +12,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/themes/chameleon/marvin/marvin.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/chameleon/marvin/marvin.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/marvin/marvin.info (original)
+++ branches/upstream/current-6/themes/chameleon/marvin/marvin.info Sun Jun 6 20:30:52 2010
@@ -7,8 +7,8 @@
core = 6.x
base theme = chameleon
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/themes/engines/phptemplate/phptemplate.engine
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/engines/phptemplate/phptemplate.engine?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/themes/engines/phptemplate/phptemplate.engine (original)
+++ branches/upstream/current-6/themes/engines/phptemplate/phptemplate.engine Sun Jun 6 20:30:52 2010
@@ -1,11 +1,14 @@
<?php
-// $Id: phptemplate.engine,v 1.69 2007/10/02 16:19:23 dries Exp $
+// $Id: phptemplate.engine,v 1.69.2.1 2010/05/11 09:48:03 goba Exp $
/**
* @file
- * Handles integration of templates written in pure php with the Drupal theme system.
+ * Handles integration of PHP templates with the Drupal theme system.
*/
+/**
+ * Implementation of hook_init().
+ */
function phptemplate_init($template) {
$file = dirname($template->filename) .'/template.php';
if (file_exists($file)) {
@@ -14,14 +17,10 @@
}
/**
- * Implementation of hook_theme to tell Drupal what templates the engine
- * and the current theme use. The $existing argument will contain hooks
- * pre-defined by Drupal so that we can use that information if
- * we need to.
+ * Implementation of hook_theme().
*/
function phptemplate_theme($existing, $type, $theme, $path) {
$templates = drupal_find_theme_functions($existing, array('phptemplate', $theme));
$templates += drupal_find_theme_templates($existing, '.tpl.php', $path);
return $templates;
}
-
Modified: branches/upstream/current-6/themes/garland/garland.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/garland.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/garland.info (original)
+++ branches/upstream/current-6/themes/garland/garland.info Sun Jun 6 20:30:52 2010
@@ -7,8 +7,8 @@
stylesheets[all][] = style.css
stylesheets[print][] = print.css
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/themes/garland/minnelli/minnelli.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/minnelli/minnelli.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/minnelli/minnelli.info (original)
+++ branches/upstream/current-6/themes/garland/minnelli/minnelli.info Sun Jun 6 20:30:52 2010
@@ -6,8 +6,8 @@
base theme = garland
stylesheets[all][] = minnelli.css
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
Modified: branches/upstream/current-6/themes/garland/template.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/template.php?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/template.php (original)
+++ branches/upstream/current-6/themes/garland/template.php Sun Jun 6 20:30:52 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: template.php,v 1.16.2.2 2009/08/10 11:32:54 goba Exp $
+// $Id: template.php,v 1.16.2.3 2010/05/11 09:41:22 goba Exp $
/**
* Sets the body-tag class attribute.
@@ -68,6 +68,9 @@
return menu_primary_local_tasks();
}
+/**
+ * Returns the themed submitted-by string for the comment.
+ */
function phptemplate_comment_submitted($comment) {
return t('!datetime — !username',
array(
@@ -76,6 +79,9 @@
));
}
+/**
+ * Returns the themed submitted-by string for the node.
+ */
function phptemplate_node_submitted($node) {
return t('!datetime — !username',
array(
Modified: branches/upstream/current-6/themes/pushbutton/pushbutton.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/pushbutton/pushbutton.info?rev=2135&op=diff
==============================================================================
--- branches/upstream/current-6/themes/pushbutton/pushbutton.info (original)
+++ branches/upstream/current-6/themes/pushbutton/pushbutton.info Sun Jun 6 20:30:52 2010
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2010-03-04
-version = "6.16"
+; Information added by drupal.org packaging script on 2010-06-02
+version = "6.17"
project = "drupal"
-datestamp = "1267662008"
+datestamp = "1275505216"
More information about the Pkg-drupal-commits
mailing list