[Pkg-drupal-commits] r2159 - 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/ sites/default/ themes/bluemarine/ themes/chameleon/ themes/chameleon/marvin/ themes/garland/ themes/garland/minnelli/ themes/pushbutton/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Fri Feb 18 18:59:19 UTC 2011
Author: luigi
Date: Fri Feb 18 18:59:17 2011
New Revision: 2159
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2159
Log:
[svn-upgrade] new version drupal6 (6.20)
Added:
branches/upstream/current-6/includes/unicode.entities.inc
branches/upstream/current-6/modules/syslog/syslog.install
Modified:
branches/upstream/current-6/CHANGELOG.txt
branches/upstream/current-6/COPYRIGHT.txt
branches/upstream/current-6/INSTALL.txt
branches/upstream/current-6/includes/actions.inc
branches/upstream/current-6/includes/batch.inc
branches/upstream/current-6/includes/bootstrap.inc
branches/upstream/current-6/includes/cache.inc
branches/upstream/current-6/includes/common.inc
branches/upstream/current-6/includes/database.inc
branches/upstream/current-6/includes/database.mysql-common.inc
branches/upstream/current-6/includes/database.mysql.inc
branches/upstream/current-6/includes/database.mysqli.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/image.inc
branches/upstream/current-6/includes/locale.inc
branches/upstream/current-6/includes/menu.inc
branches/upstream/current-6/includes/module.inc
branches/upstream/current-6/includes/path.inc
branches/upstream/current-6/includes/theme.inc
branches/upstream/current-6/includes/unicode.inc
branches/upstream/current-6/install.php
branches/upstream/current-6/modules/aggregator/aggregator.info
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/book/book.pages.inc
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.admin.inc
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/forum/forum.module
branches/upstream/current-6/modules/help/help.info
branches/upstream/current-6/modules/locale/locale.info
branches/upstream/current-6/modules/locale/locale.module
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/openid/openid.install
branches/upstream/current-6/modules/openid/openid.module
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/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.info
branches/upstream/current-6/modules/syslog/syslog.info
branches/upstream/current-6/modules/syslog/syslog.module
branches/upstream/current-6/modules/system/page.tpl.php
branches/upstream/current-6/modules/system/system.admin.inc
branches/upstream/current-6/modules/system/system.css
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.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/translation/translation.module
branches/upstream/current-6/modules/trigger/trigger.admin.inc
branches/upstream/current-6/modules/trigger/trigger.info
branches/upstream/current-6/modules/trigger/trigger.module
branches/upstream/current-6/modules/update/update.info
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/robots.txt
branches/upstream/current-6/sites/default/default.settings.php
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/garland/garland.info
branches/upstream/current-6/themes/garland/minnelli/minnelli.info
branches/upstream/current-6/themes/garland/print.css
branches/upstream/current-6/themes/pushbutton/pushbutton.info
branches/upstream/current-6/update.php
Modified: branches/upstream/current-6/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/CHANGELOG.txt?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/CHANGELOG.txt (original)
+++ branches/upstream/current-6/CHANGELOG.txt Fri Feb 18 18:59:17 2011
@@ -1,4 +1,12 @@
-// $Id: CHANGELOG.txt,v 1.253.2.39.2.1 2010/08/11 20:22:27 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.43 2010/12/15 21:11:22 goba Exp $
+
+Drupal 6.20, 2010-12-15
+----------------------
+- Fixed a variety of small bugs, improved code documentation.
+
+Drupal 6.19, 2010-08-11
+----------------------
+- Fixed a variety of small bugs, improved code documentation.
Drupal 6.18, 2010-08-11
----------------------
@@ -233,6 +241,11 @@
- Removed old system updates. Updates from Drupal versions prior to 5.x will
require upgrading to 5.x before upgrading to 6.x.
+Drupal 5.23, 2010-08-11
+-----------------------
+- Fixed security issues (File download access bypass, Comment unpublishing
+ bypass), see SA-CORE-2010-002.
+
Drupal 5.22, 2010-03-03
-----------------------
- Fixed security issues (Open redirection, Locale module cross site scripting,
Modified: branches/upstream/current-6/COPYRIGHT.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/COPYRIGHT.txt?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/COPYRIGHT.txt (original)
+++ branches/upstream/current-6/COPYRIGHT.txt Fri Feb 18 18:59:17 2011
@@ -1,6 +1,6 @@
-// $Id: COPYRIGHT.txt,v 1.2.2.2 2009/09/14 12:50:38 goba Exp $
+// $Id: COPYRIGHT.txt,v 1.2.2.3 2010/08/06 10:58:29 goba Exp $
-All Drupal code is Copyright 2001 - 2009 by the original authors.
+All Drupal code is Copyright 2001 - 2010 by the original authors.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: branches/upstream/current-6/INSTALL.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/INSTALL.txt?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/INSTALL.txt (original)
+++ branches/upstream/current-6/INSTALL.txt Fri Feb 18 18:59:17 2011
@@ -1,4 +1,4 @@
-// $Id: INSTALL.txt,v 1.61.2.4 2008/07/09 19:15:59 goba Exp $
+// $Id: INSTALL.txt,v 1.61.2.5 2010/12/06 06:50:55 goba Exp $
CONTENTS OF THIS FILE
---------------------
@@ -71,7 +71,7 @@
different language, we have good news. You can install and use Drupal in
other languages from the start. Check whether a released package of the
language desired is available for this Drupal version at
- http://drupal.org/project/translations and download the package. Extract
+ http://localize.drupal.org and download the package. Extract
the contents to the same directory where you extracted Drupal into.
2. CREATE THE CONFIGURATION FILE AND GRANT WRITE PERMISSIONS
Modified: branches/upstream/current-6/includes/actions.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/actions.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/actions.inc (original)
+++ branches/upstream/current-6/includes/actions.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: actions.inc,v 1.8.2.12.2.1 2010/08/11 20:22:27 goba Exp $
+// $Id: actions.inc,v 1.8.2.13 2010/08/11 20:35:47 goba Exp $
/**
* @file
Modified: branches/upstream/current-6/includes/batch.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/batch.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/batch.inc (original)
+++ branches/upstream/current-6/includes/batch.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: batch.inc,v 1.14 2007/12/20 11:57:20 goba Exp $
+// $Id: batch.inc,v 1.14.2.1 2010/08/06 11:52:19 goba Exp $
/**
* @file Batch processing API for processes to run in multiple HTTP requests.
@@ -133,6 +133,7 @@
// followed by the error message.
ob_start();
$fallback = $current_set['error_message'] .'<br/>'. $batch['error_message'];
+ drupal_maintenance_theme();
$fallback = theme('maintenance_page', $fallback, FALSE, FALSE);
// We strip the end of the page using a marker in the template, so any
Modified: branches/upstream/current-6/includes/bootstrap.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/bootstrap.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/bootstrap.inc (original)
+++ branches/upstream/current-6/includes/bootstrap.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: bootstrap.inc,v 1.206.2.23 2010/06/02 13:07:45 goba Exp $
+// $Id: bootstrap.inc,v 1.206.2.31 2010/12/15 13:21:14 goba Exp $
/**
* @file
@@ -213,6 +213,11 @@
* Language written right to left. Possible value of $language->direction.
*/
define('LANGUAGE_RTL', 1);
+
+// Hide E_DEPRECATED messages.
+if (defined('E_DEPRECATED')) {
+ error_reporting(error_reporting() & ~E_DEPRECATED);
+}
/**
* Start the timer with the specified name. If you start and stop
@@ -371,7 +376,7 @@
global $base_url, $base_path, $base_root;
// Export the following settings.php variables to the global namespace
- global $db_url, $db_prefix, $cookie_domain, $conf, $installed_profile, $update_free_access;
+ global $db_url, $db_prefix, $db_collation, $cookie_domain, $conf, $installed_profile, $update_free_access;
$conf = array();
if (isset($_SERVER['HTTP_HOST'])) {
@@ -483,7 +488,7 @@
* the above, depending on where the module is located.
*
* @param $type
- * The type of the item (i.e. theme, theme_engine, module).
+ * The type of the item (i.e. theme, theme_engine, module, profile).
* @param $name
* The name of the item for which the filename is requested.
* @param $filename
@@ -561,7 +566,11 @@
}
/**
- * Return a persistent variable.
+ * Returns a persistent variable.
+ *
+ * Case-sensitivity of the variable_* functions depends on the database
+ * collation used. To avoid problems, always use lower case for persistent
+ * variable names.
*
* @param $name
* The name of the variable to return.
@@ -579,7 +588,11 @@
}
/**
- * Set a persistent variable.
+ * Sets a persistent variable.
+ *
+ * Case-sensitivity of the variable_* functions depends on the database
+ * collation used. To avoid problems, always use lower case for persistent
+ * variable names.
*
* @param $name
* The name of the variable to set.
@@ -604,7 +617,11 @@
}
/**
- * Unset a persistent variable.
+ * Unsets a persistent variable.
+ *
+ * Case-sensitivity of the variable_* functions depends on the database
+ * collation used. To avoid problems, always use lower case for persistent
+ * variable names.
*
* @param $name
* The name of the variable to undefine.
@@ -670,7 +687,7 @@
* including a theme, engine, module, etc., more than once.
*
* @param $type
- * The type of item to load (i.e. theme, theme_engine, module).
+ * The type of item to load (i.e. theme, theme_engine, module, profile).
* @param $name
* The name of the item to load.
*
@@ -791,7 +808,7 @@
function drupal_unpack($obj, $field = 'data') {
if ($obj->$field && $data = unserialize($obj->$field)) {
foreach ($data as $key => $value) {
- if (!isset($obj->$key)) {
+ if (!empty($key) && !isset($obj->$key)) {
$obj->$key = $value;
}
}
@@ -909,7 +926,8 @@
* Log a system message.
*
* @param $type
- * The category to which this message belongs.
+ * The category to which this message belongs. Can be any string, but the
+ * general practice is to use the name of the module calling watchdog().
* @param $message
* The message to store in the log. See t() for documentation
* on how $message and $variables interact. Keep $message
@@ -919,7 +937,8 @@
* NULL if message is already translated or not possible to
* translate.
* @param $severity
- * The severity of the message, as per RFC 3164
+ * The severity of the message, as per RFC 3164. Possible values are
+ * WATCHDOG_ERROR, WATCHDOG_WARNING, etc.
* @param $link
* A link to associate with the message.
*
@@ -943,7 +962,7 @@
);
// Call the logging hooks to log/process the message
- foreach (module_implements('watchdog', TRUE) as $module) {
+ foreach (module_implements('watchdog') as $module) {
module_invoke($module, 'watchdog', $log_message);
}
}
Modified: branches/upstream/current-6/includes/cache.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/cache.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/cache.inc (original)
+++ branches/upstream/current-6/includes/cache.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: cache.inc,v 1.17.2.4 2009/12/16 17:30:00 goba Exp $
+// $Id: cache.inc,v 1.17.2.5 2010/11/03 19:07:46 goba Exp $
/**
* Return data from the persistent cache. Data may be stored as either plain text or as serialized data.
@@ -39,7 +39,7 @@
// cache timer. The cache variable is loaded into the $user object by
// sess_read() in session.inc.
else {
- if ($user->cache > $cache->created) {
+ if (isset($user->cache) && $user->cache > $cache->created) {
// This cache data is too old and thus not valid for us, ignore it.
return 0;
}
Modified: branches/upstream/current-6/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/common.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/common.inc (original)
+++ branches/upstream/current-6/includes/common.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.756.2.88 2010/06/02 18:52:32 goba Exp $
+// $Id: common.inc,v 1.756.2.106 2010/12/15 21:11:22 goba Exp $
/**
* @file
@@ -953,14 +953,15 @@
*/
/**
- * Verify the syntax of the given e-mail address.
- *
- * Empty e-mail addresses are allowed. See RFC 2822 for details.
+ * Verifies the syntax of the given e-mail address.
+ *
+ * See RFC 2822 for details.
*
* @param $mail
* A string containing an e-mail address.
* @return
- * TRUE if the address is in a valid format.
+ * 1 if the email address is valid, 0 if it is invalid or empty, and FALSE if
+ * there is an input error (such as passing in an array instead of a string).
*/
function valid_email_address($mail) {
$user = '[a-zA-Z0-9_\-\.\+\^!#\$%&*+\/\=\?\`\|\{\}~\']+';
@@ -1382,42 +1383,48 @@
*/
/**
- * Generate a URL from a Drupal menu path. Will also pass-through existing URLs.
+ * Generates an internal or external URL.
+ *
+ * When creating links in modules, consider whether l() could be a better
+ * alternative than url().
*
* @param $path
- * The Drupal path being linked to, such as "admin/content/node", or an
- * existing URL like "http://drupal.org/". The special path
- * '<front>' may also be given and will generate the site's base URL.
+ * The internal path or external URL being linked to, such as "node/34" or
+ * "http://example.com/foo". A few notes:
+ * - If you provide a full URL, it will be considered an external URL.
+ * - If you provide only the path (e.g. "node/34"), it will be
+ * considered an internal link. In this case, it should be a system URL,
+ * and it will be replaced with the alias, if one exists. Additional query
+ * arguments for internal paths must be supplied in $options['query'], not
+ * included in $path.
+ * - If you provide an internal path and $options['alias'] is set to TRUE, the
+ * path is assumed already to be the correct path alias, and the alias is
+ * not looked up.
+ * - The special string '<front>' generates a link to the site's base URL.
+ * - If your external URL contains a query (e.g. http://example.com/foo?a=b),
+ * then you can either URL encode the query keys and values yourself and
+ * include them in $path, or use $options['query'] to let this function
+ * URL encode them.
* @param $options
- * An associative array of additional options, with the following keys:
- * - 'query'
- * A URL-encoded query string to append to the link, or an array of query
- * key/value-pairs without any URL-encoding.
- * - 'fragment'
- * A fragment identifier (or named anchor) to append to the link.
- * Do not include the '#' character.
- * - 'absolute' (default FALSE)
- * Whether to force the output to be an absolute link (beginning with
- * http:). Useful for links that will be displayed outside the site, such
- * as in an RSS feed.
- * - 'alias' (default FALSE)
- * Whether the given path is an alias already.
- * - 'external'
- * Whether the given path is an external URL.
- * - 'language'
- * An optional language object. Used to build the URL to link to and
- * look up the proper alias for the link.
- * - 'base_url'
- * Only used internally, to modify the base URL when a language dependent
- * URL requires so.
- * - 'prefix'
- * Only used internally, to modify the path when a language dependent URL
- * requires so.
+ * An associative array of additional options, with the following elements:
+ * - 'query': A URL-encoded query string to append to the link, or an array of
+ * query key/value-pairs without any URL-encoding.
+ * - 'fragment': A fragment identifier (named anchor) to append to the URL.
+ * Do not include the leading '#' character.
+ * - 'absolute' (default FALSE): Whether to force the output to be an absolute
+ * link (beginning with http:). Useful for links that will be displayed
+ * outside the site, such as in an RSS feed.
+ * - 'alias' (default FALSE): Whether the given path is a URL alias already.
+ * - 'external': Whether the given path is an external URL.
+ * - 'language': An optional language object. Used to build the URL to link
+ * to and look up the proper alias for the link.
+ * - 'base_url': Only used internally, to modify the base URL when a language
+ * dependent URL requires so.
+ * - 'prefix': Only used internally, to modify the path when a language
+ * dependent URL requires so.
+ *
* @return
* A string containing a URL to the given path.
- *
- * When creating links in modules, consider whether l() could be a better
- * alternative than url().
*/
function url($path = NULL, $options = array()) {
// Merge in defaults.
@@ -1544,47 +1551,37 @@
}
/**
- * Format an internal Drupal link.
- *
- * This function correctly handles aliased paths, and allows themes to highlight
- * links to the current page correctly, so all internal links output by modules
- * should be generated by this function if possible.
+ * Formats an internal or external URL link as an HTML anchor tag.
+ *
+ * This function correctly handles aliased paths, and adds an 'active' class
+ * attribute to links that point to the current page (for theming), so all
+ * internal links output by modules should be generated by this function if
+ * possible.
*
* @param $text
- * The text to be enclosed with the anchor tag.
+ * The link text for the anchor tag.
* @param $path
- * The Drupal path being linked to, such as "admin/content/node". Can be an
- * external or internal URL.
- * - If you provide the full URL, it will be considered an external URL.
- * - If you provide only the path (e.g. "admin/content/node"), it is
- * considered an internal link. In this case, it must be a system URL
- * as the url() function will generate the alias.
- * - If you provide '<front>', it generates a link to the site's
- * base URL (again via the url() function).
- * - If you provide a path, and 'alias' is set to TRUE (see below), it is
- * used as is.
+ * The internal path or external URL being linked to, such as "node/34" or
+ * "http://example.com/foo". After the url() function is called to construct
+ * the URL from $path and $options, the resulting URL is passed through
+ * check_url() before it is inserted into the HTML anchor tag, to ensure
+ * well-formed HTML. See url() for more information and notes.
* @param $options
- * An associative array of additional options, with the following keys:
- * - 'attributes'
- * An associative array of HTML attributes to apply to the anchor tag.
- * - 'query'
- * A query string to append to the link, or an array of query key/value
- * properties.
- * - 'fragment'
- * A fragment identifier (named anchor) to append to the link.
- * Do not include the '#' character.
- * - 'absolute' (default FALSE)
- * Whether to force the output to be an absolute link (beginning with
- * http:). Useful for links that will be displayed outside the site, such
- * as in an RSS feed.
- * - 'html' (default FALSE)
- * Whether the title is HTML, or just plain-text. For example for making
- * an image a link, this must be set to TRUE, or else you will see the
- * escaped HTML.
- * - 'alias' (default FALSE)
- * Whether the given path is an alias already.
+ * An associative array of additional options, with the following elements:
+ * - 'attributes': An associative array of HTML attributes to apply to the
+ * anchor tag.
+ * - 'html' (default FALSE): Whether $text is HTML or just plain-text. For
+ * example, to make an image tag into a link, this must be set to TRUE, or
+ * you will see the escaped HTML image tag.
+ * - 'language': An optional language object. If the path being linked to is
+ * internal to the site, $options['language'] is used to look up the alias
+ * for the URL, and to determine whether the link is "active", or pointing
+ * to the current page (the language as well as the path must match).This
+ * element is also used by url().
+ * - Additional $options elements used by the url() function.
+ *
* @return
- * an HTML string containing a link to the given path.
+ * An HTML string containing a link to the given path.
*/
function l($text, $path, $options = array()) {
global $language;
@@ -1710,7 +1707,7 @@
* Returns the path to a system item (module, theme, etc.).
*
* @param $type
- * The type of the item (i.e. theme, theme_engine, module).
+ * The type of the item (i.e. theme, theme_engine, module, profile).
* @param $name
* The name of the item for which the path is requested.
*
@@ -1748,7 +1745,7 @@
*
* @param $path
* (optional) The path to the CSS file relative to the base_path(), e.g.,
- * /modules/devel/devel.css.
+ * modules/devel/devel.css.
*
* Modules should always prefix the names of their CSS files with the module
* name, for example: system-menus.css rather than simply menus.css. Themes
@@ -2021,10 +2018,21 @@
if ($_optimize) {
// Perform some safe CSS optimizations.
- $contents = preg_replace('<
- \s*([@{}:;,]|\)\s|\s\()\s* | # Remove whitespace around separators, but keep space around parentheses.
- /\*([^*\\\\]|\*(?!/))+\*/ # Remove comments that are not CSS hacks.
- >x', '\1', $contents);
+ // Regexp to match comment blocks.
+ $comment = '/\*[^*]*\*+(?:[^/*][^*]*\*+)*/';
+ // Regexp to match double quoted strings.
+ $double_quot = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"';
+ // Regexp to match single quoted strings.
+ $single_quot = "'[^'\\\\]*(?:\\\\.[^'\\\\]*)*'";
+ $contents = preg_replace_callback(
+ "<$double_quot|$single_quot|$comment>Ss", // Match all comment blocks along
+ "_process_comment", // with double/single quoted strings
+ $contents); // and feed them to _process_comment().
+ $contents = preg_replace(
+ '<\s*([@{}:;,]|\)\s|\s\()\s*>S', // Remove whitespace around separators,
+ '\1', $contents); // but keep space around parentheses.
+ // End the file with a new line.
+ $contents .= "\n";
}
// Change back directory.
@@ -2032,6 +2040,41 @@
}
return $contents;
+}
+
+/**
+ * Process comment blocks.
+ *
+ * This is the callback function for the preg_replace_callback()
+ * used in drupal_load_stylesheet_content(). Support for comment
+ * hacks is implemented here.
+ */
+function _process_comment($matches) {
+ static $keep_nextone = FALSE;
+
+ // Quoted string, keep it.
+ if ($matches[0][0] == "'" || $matches[0][0] == '"') {
+ return $matches[0];
+ }
+ // End of IE-Mac hack, keep it.
+ if ($keep_nextone) {
+ $keep_nextone = FALSE;
+ return $matches[0];
+ }
+ switch (strrpos($matches[0], '\\')) {
+ case FALSE :
+ // No backslash, strip it.
+ return '';
+
+ case drupal_strlen($matches[0])-3 :
+ // Ends with \*/ so is a multi line IE-Mac hack, keep the next one also.
+ $keep_nextone = TRUE;
+ return '/*_\*/';
+
+ default :
+ // Single line IE-Mac hack.
+ return '/*\_*/';
+ }
}
/**
@@ -2793,18 +2836,28 @@
/**
- * This dispatch function hands off structured Drupal arrays to type-specific
- * *_alter implementations. It ensures a consistent interface for all altering
- * operations.
+ * Hands off alterable variables to type-specific *_alter implementations.
+ *
+ * This dispatch function hands off the passed in variables to type-specific
+ * hook_TYPE_alter() implementations in modules. It ensures a consistent
+ * interface for all altering operations.
*
* @param $type
- * The data type of the structured array. 'form', 'links',
- * 'node_content', and so on are several examples.
+ * A string describing the type of the alterable $data (e.g. 'form',
+ * 'profile').
* @param $data
- * The structured array to be altered.
+ * The variable that will be passed to hook_TYPE_alter() implementations to
+ * be altered. The type of this variable depends on $type. For example, when
+ * altering a 'form', $data will be a structured array. When altering a
+ * 'profile', $data will be an object. If you need to pass additional
+ * parameters by reference to the hook_TYPE_alter() functions, include them
+ * as an array in $data['__drupal_alter_by_ref']. They will be unpacked and
+ * passed to the hook_TYPE_alter() functions, before the additional
+ * ... parameters (see below).
* @param ...
- * Any additional params will be passed on to the called
- * hook_$type_alter functions.
+ * Any additional parameters will be passed on to the hook_TYPE_alter()
+ * functions (not by reference), after any by-reference parameters included
+ * in $data (see above)
*/
function drupal_alter($type, &$data) {
// PHP's func_get_args() always returns copies of params, not references, so
@@ -2845,8 +2898,15 @@
* Renders HTML given a structured array tree.
*
* Recursively iterates over each of the array elements, generating HTML code.
- * This function is usually called from within a another function, like
+ * This function is usually called from within another function, like
* drupal_get_form() or node_view().
+ *
+ * drupal_render() flags each element with a '#printed' status to indicate that
+ * the element has been rendered, which allows individual elements of a given
+ * array to be rendered independently. This prevents elements from being
+ * rendered more than once on subsequent calls to drupal_render() if, for example,
+ * they are part of a larger array. If the same array or array element is passed
+ * more than once to drupal_render(), it simply returns a NULL value.
*
* @param $elements
* The structured array describing the data to be rendered.
@@ -3097,10 +3157,6 @@
'pager_link' => array(
'arguments' => array('text' => NULL, 'page_new' => NULL, 'element' => NULL, 'parameters' => array(), 'attributes' => array()),
),
- // from locale.inc
- 'locale_admin_manage_screen' => array(
- 'arguments' => array('form' => NULL),
- ),
// from menu.inc
'menu_item_link' => array(
'arguments' => array('item' => NULL),
@@ -3216,7 +3272,10 @@
// Invoke hook_schema for all modules.
foreach (module_implements('schema') as $module) {
- $current = module_invoke($module, 'schema');
+ // Cast the result of hook_schema() to an array, as a NULL return value
+ // would cause array_merge() to set the $schema variable to NULL as well.
+ // That would break modules which use $schema further down the line.
+ $current = (array) module_invoke($module, 'schema');
_drupal_initialize_schema($module, $current);
$schema = array_merge($schema, $current);
}
@@ -3313,15 +3372,17 @@
*/
function drupal_get_schema_unprocessed($module, $table = NULL) {
// Load the .install file to get hook_schema.
- module_load_include('install', $module);
+ module_load_install($module);
$schema = module_invoke($module, 'schema');
if (!is_null($table) && isset($schema[$table])) {
return $schema[$table];
}
- else {
+ elseif (!empty($schema)) {
return $schema;
}
+
+ return array();
}
/**
@@ -3641,6 +3702,8 @@
/**
* Explode a string of given tags into an array.
+ *
+ * @see drupal_implode_tags()
*/
function drupal_explode_tags($tags) {
// This regexp allows the following types of user input:
@@ -3665,6 +3728,8 @@
/**
* Implode an array of tags into a string.
+ *
+ * @see drupal_explode_tags()
*/
function drupal_implode_tags($tags) {
$encoded_tags = array();
Modified: branches/upstream/current-6/includes/database.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/database.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.inc (original)
+++ branches/upstream/current-6/includes/database.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: database.inc,v 1.92.2.9 2010/02/01 16:32:10 goba Exp $
+// $Id: database.inc,v 1.92.2.11 2010/11/03 14:02:33 goba Exp $
/**
* @file
@@ -389,16 +389,20 @@
}
/**
- * Adds the DISTINCT flag to the supplied query if a DISTINCT doesn't already
- * exist in the query. Returns the altered query.
- *
- * This will not, and never did guarantee that you will obtain distinct
- * values of $table.$field.
- *
- * @param $table Unused. Kept to remain API compatibility.
- * @param $field Unused. Kept to remain API compatibility.
- * @param $query Query to which the DISTINCT flag should be applied.
- * @return SQL query with the DISTINCT flag set.
+ * Adds the DISTINCT flag to the supplied query and returns the altered query.
+ *
+ * The supplied query should not contain a DISTINCT flag. This will not, and
+ * never did guarantee that you will obtain distinct values of $table.$field.
+ *
+ * @param $table
+ * Unused. Kept to retain API compatibility.
+ * @param $field
+ * Unused. Kept to retain API compatibility.
+ * @param $query
+ * Query to which the DISTINCT flag should be applied.
+ *
+ * @return
+ * SQL query with the DISTINCT flag set.
*/
function db_distinct_field($table, $field, $query) {
$matches = array();
@@ -406,6 +410,7 @@
// Only add distinct to the outer SELECT to avoid messing up subqueries.
$query = preg_replace('/^SELECT/i', 'SELECT DISTINCT', $query);
}
+
return $query;
}
@@ -449,7 +454,6 @@
* - 'fields': An associative array ('fieldname' => specification)
* that describes the table's database columns. The specification
* is also an array. The following specification parameters are defined:
- *
* - 'description': A string describing this field and its purpose.
* References to other tables should be enclosed in
* curly-brackets. For example, the node table vid field
@@ -468,7 +472,6 @@
* datatypes will be used (e.g. on MySQL, TINYINT vs. INT vs. BIGINT).
* 'normal', the default, selects the base type (e.g. on MySQL,
* INT, VARCHAR, BLOB, etc.).
- *
* Not all sizes are available for all data types. See
* db_type_map() for possible combinations.
* - 'not null': If true, no NULL values will be allowed in this
@@ -487,10 +490,8 @@
* the precision (total number of significant digits) and scale
* (decimal digits right of the decimal point). Both values are
* mandatory. Ignored for other field types.
- *
* All parameters apart from 'type' are optional except that type
* 'numeric' columns must specify 'precision' and 'scale'.
- *
* - 'primary key': An array of one or more key column specifiers (see below)
* that form the primary key.
* - 'unique keys': An associative array of unique keys ('keyname' =>
Modified: branches/upstream/current-6/includes/database.mysql-common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/database.mysql-common.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.mysql-common.inc (original)
+++ branches/upstream/current-6/includes/database.mysql-common.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: database.mysql-common.inc,v 1.17.2.4 2010/03/01 10:37:30 goba Exp $
+// $Id: database.mysql-common.inc,v 1.17.2.5 2010/12/15 13:21:14 goba Exp $
/**
* @file
@@ -60,7 +60,16 @@
function db_create_table_sql($name, $table) {
if (empty($table['mysql_suffix'])) {
- $table['mysql_suffix'] = "/*!40100 DEFAULT CHARACTER SET UTF8 */";
+ $table['mysql_suffix'] = '/*!40100 DEFAULT CHARACTER SET utf8';
+ // By default, MySQL uses the default collation for new tables, which is
+ // 'utf8_general_ci' for utf8. If an alternate collation has been set, it
+ // needs to be explicitly specified.
+ // @see db_connect()
+ $collation = (!empty($table['collation']) ? $table['collation'] : (!empty($GLOBALS['db_collation']) ? $GLOBALS['db_collation'] : ''));
+ if ($collation) {
+ $table['mysql_suffix'] .= ' COLLATE ' . $collation;
+ }
+ $table['mysql_suffix'] .= ' */';
}
$sql = "CREATE TABLE {". $name ."} (\n";
Modified: branches/upstream/current-6/includes/database.mysql.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/database.mysql.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.mysql.inc (original)
+++ branches/upstream/current-6/includes/database.mysql.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: database.mysql.inc,v 1.89.2.2 2010/02/01 16:32:10 goba Exp $
+// $Id: database.mysql.inc,v 1.89.2.4 2010/12/15 20:41:10 goba Exp $
/**
* @file
@@ -80,8 +80,16 @@
_db_error_page(mysql_error());
}
- // Force UTF-8.
- mysql_query('SET NAMES "utf8"', $connection);
+ // Force MySQL to use the UTF-8 character set. Also set the collation, if a
+ // certain one has been set; otherwise, MySQL defaults to 'utf8_general_ci'
+ // for UTF-8.
+ if (!empty($GLOBALS['db_collation'])) {
+ mysql_query('SET NAMES utf8 COLLATE '. $GLOBALS['db_collation'], $connection);
+ }
+ else {
+ mysql_query('SET NAMES utf8', $connection);
+ }
+
return $connection;
}
@@ -169,6 +177,7 @@
*
* @param $result
* A database query result resource, as returned from db_query().
+ *
* @return
* The resulting field or FALSE.
*/
@@ -337,6 +346,12 @@
/**
* Check if a table exists.
+ *
+ * @param $table
+ * The name of the table.
+ *
+ * @return
+ * TRUE if the table exists, and FALSE if the table does not exist.
*/
function db_table_exists($table) {
return (bool) db_fetch_object(db_query("SHOW TABLES LIKE '{". db_escape_table($table) ."}'"));
@@ -344,6 +359,14 @@
/**
* Check if a column exists in the given table.
+ *
+ * @param $table
+ * The name of the table.
+ * @param $column
+ * The name of the column.
+ *
+ * @return
+ * TRUE if the column exists, and FALSE if the column does not exist.
*/
function db_column_exists($table, $column) {
return (bool) db_fetch_object(db_query("SHOW COLUMNS FROM {". db_escape_table($table) ."} LIKE '". db_escape_table($column) ."'"));
Modified: branches/upstream/current-6/includes/database.mysqli.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/database.mysqli.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.mysqli.inc (original)
+++ branches/upstream/current-6/includes/database.mysqli.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: database.mysqli.inc,v 1.54.2.2 2010/02/01 16:32:10 goba Exp $
+// $Id: database.mysqli.inc,v 1.54.2.4 2010/12/15 20:41:10 goba Exp $
/**
* @file
@@ -79,8 +79,15 @@
_db_error_page(mysqli_connect_error());
}
- // Force UTF-8.
- mysqli_query($connection, 'SET NAMES "utf8"');
+ // Force MySQL to use the UTF-8 character set. Also set the collation, if a
+ // certain one has been set; otherwise, MySQL defaults to 'utf8_general_ci'
+ // for UTF-8.
+ if (!empty($GLOBALS['db_collation'])) {
+ mysqli_query($connection, 'SET NAMES utf8 COLLATE ' . $GLOBALS['db_collation']);
+ }
+ else {
+ mysqli_query($connection, 'SET NAMES utf8');
+ }
return $connection;
}
@@ -339,6 +346,12 @@
/**
* Check if a table exists.
+ *
+ * @param $table
+ * The name of the table.
+ *
+ * @return
+ * TRUE if the table exists, and FALSE if the table does not exist.
*/
function db_table_exists($table) {
return (bool) db_fetch_object(db_query("SHOW TABLES LIKE '{". db_escape_table($table) ."}'"));
@@ -346,6 +359,14 @@
/**
* Check if a column exists in the given table.
+ *
+ * @param $table
+ * The name of the table.
+ * @param $column
+ * The name of the column.
+ *
+ * @return
+ * TRUE if the column exists, and FALSE if the column does not exist.
*/
function db_column_exists($table, $column) {
return (bool) db_fetch_object(db_query("SHOW COLUMNS FROM {". db_escape_table($table) ."} LIKE '". db_escape_table($column) ."'"));
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/database.pgsql.inc (original)
+++ branches/upstream/current-6/includes/database.pgsql.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: database.pgsql.inc,v 1.68.2.9 2010/05/28 15:02:16 goba Exp $
+// $Id: database.pgsql.inc,v 1.68.2.11 2010/12/15 20:41:10 goba Exp $
/**
* @file
@@ -383,6 +383,12 @@
/**
* Check if a table exists.
+ *
+ * @param $table
+ * The name of the table.
+ *
+ * @return
+ * TRUE if the table exists, and FALSE if the table does not exist.
*/
function db_table_exists($table) {
return (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '{". db_escape_table($table) ."}'"));
@@ -390,6 +396,14 @@
/**
* Check if a column exists in the given table.
+ *
+ * @param $table
+ * The name of the table.
+ * @param $column
+ * The name of the column.
+ *
+ * @return
+ * TRUE if the column exists, and FALSE if the column does not exist.
*/
function db_column_exists($table, $column) {
return (bool) db_result(db_query("SELECT COUNT(pg_attribute.attname) FROM pg_class, pg_attribute WHERE pg_attribute.attrelid = pg_class.oid AND pg_class.relname = '{". db_escape_table($table) ."}' AND attname = '". db_escape_table($column) ."'"));
@@ -643,7 +657,7 @@
* created field will be set to the value of the key in all rows.
* This is most useful for creating NOT NULL columns with no default
* value in existing tables.
- * @param $keys_new
+ * @param $new_keys
* Optional keys and indexes specification to be created on the
* table along with adding the field. The format is the same as a
* table specification but without the 'fields' element. If you are
Modified: branches/upstream/current-6/includes/file.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/file.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/file.inc (original)
+++ branches/upstream/current-6/includes/file.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: file.inc,v 1.121.2.12 2010/05/11 09:49:58 goba Exp $
+// $Id: file.inc,v 1.121.2.14 2010/12/13 19:02:09 goba Exp $
/**
* @file
@@ -359,11 +359,23 @@
/**
* Modify a filename as needed for security purposes.
*
- * Dangerous file names will be altered; for instance, the file name
- * "exploit.php.pps" will become "exploit.php_.pps". All extensions that are
+ * Munging a file name prevents unknown file extensions from masking exploit
+ * files. When web servers such as Apache decide how to process a URL request,
+ * they use the file extension. If the extension is not recognized, Apache
+ * skips that extension and uses the previous file extension. For example, if
+ * the file being requested is exploit.php.pps, and Apache does not recognize
+ * the '.pps' extension, it treats the file as PHP and executes it. To make
+ * this file name safe for Apache and prevent it from executing as PHP, the
+ * .php extension is "munged" into .php_, making the safe file name
+ * exploit.php_.pps.
+ *
+ * Specifically, this function adds an underscore to all extensions that are
* between 2 and 5 characters in length, internal to the file name, and not
- * included in $extensions will be altered by adding an underscore. If variable
- * 'allow_insecure_uploads' evaluates to TRUE, no alterations will be made.
+ * included in $extensions.
+ *
+ * Function behavior is also controlled by the Drupal variable
+ * 'allow_insecure_uploads'. If 'allow_insecure_uploads' evaluates to TRUE, no
+ * alterations will be made, if it evaluates to FALSE, the filename is 'munged'.
*
* @param $filename
* File name to modify.
@@ -475,17 +487,17 @@
}
/**
- * Saves a file upload to a new location. The source file is validated as a
- * proper upload and handled as such.
- *
- * The file will be added to the files table as a temporary file. Temporary files
- * are periodically cleaned. To make the file permanent file call
+ * Saves a file upload to a new location.
+ *
+ * The source file is validated as a proper upload and handled as such.
+ * The file will be added to the files table as a temporary file. Temporary
+ * files are periodically cleaned. To make the file permanent file call
* file_set_status() to change its status.
*
* @param $source
* A string specifying the name of the upload field to save.
* @param $validators
- * An optional, associative array of callback functions used to validate the
+ * (optional) An associative array of callback functions used to validate the
* file. The keys are function names and the values arrays of callback
* parameters which will be passed in after the file object. The
* functions should return an array of error messages; an empty array
@@ -495,9 +507,12 @@
* A string containing the directory $source should be copied to. If this is
* not provided or is not writable, the temporary directory will be used.
* @param $replace
- * A boolean indicating whether an existing file of the same name in the
- * destination directory should overwritten. A false value will generate a
- * new, unique filename in the destination directory.
+ * 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
* An object containing the file information, or 0 in the event of an error.
*/
Modified: branches/upstream/current-6/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/form.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/form.inc (original)
+++ branches/upstream/current-6/includes/form.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.265.2.33 2010/05/19 15:02:32 goba Exp $
+// $Id: form.inc,v 1.265.2.35 2010/11/04 09:55:29 goba Exp $
/**
* @defgroup forms Form builder functions
@@ -62,7 +62,9 @@
* Any additional arguments are passed on to the functions called by
* drupal_get_form(), including the unique form constructor function.
* For example, the node_edit form requires that a node object be passed
- * in here when it is called.
+ * in here when it is called. These are available to implementations of
+ * hook_form_alter() and hook_form_FORM_ID_alter() as the array
+ * $form['#parameters'].
* @return
* The rendered form.
*/
@@ -248,9 +250,14 @@
}
/**
- * Retrieves a form using a form_id, populates it with $form_state['values'],
- * processes it, and returns any validation errors encountered. This
- * function is the programmatic counterpart to drupal_get_form().
+ * Retrieves, populates, and processes a form.
+ *
+ * This function allows you to supply values for form elements and submit a
+ * form for processing. Compare to drupal_get_form(), which also builds and
+ * processes a form, but does not allow you to supply values.
+ *
+ * There is no return value, but you can check to see if there are errors by
+ * calling form_get_errors().
*
* @param $form_id
* The unique string identifying the desired form. If a function
@@ -270,7 +277,6 @@
* For example, the node_edit form requires that a node object be passed
* in here when it is called.
* For example:
- *
* @code
* // register a new user
* $form_state = array();
Modified: branches/upstream/current-6/includes/image.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/image.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/image.inc (original)
+++ branches/upstream/current-6/includes/image.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: image.inc,v 1.24 2008/01/28 16:05:17 goba Exp $
+// $Id: image.inc,v 1.24.2.1 2010/12/15 14:08:17 goba Exp $
/**
* @file
@@ -114,7 +114,7 @@
* 'file_size' - File size in bytes.
*/
function image_get_info($file) {
- if (!is_file($file)) {
+ if (!is_file($file) && !is_uploaded_file($filepath)) {
return FALSE;
}
Modified: branches/upstream/current-6/includes/locale.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/locale.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/locale.inc (original)
+++ branches/upstream/current-6/includes/locale.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: locale.inc,v 1.174.2.13 2010/05/28 13:07:27 goba Exp $
+// $Id: locale.inc,v 1.174.2.14 2010/08/11 19:42:26 goba Exp $
/**
* @file
@@ -1145,7 +1145,7 @@
$context = "MSGID_PLURAL";
}
elseif (!strncmp("msgid", $line, 5)) {
- if ($context == "MSGSTR") { // End current entry, start a new one
+ if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
$current = array();
}
@@ -1290,7 +1290,7 @@
$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
+ // 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']);
Modified: branches/upstream/current-6/includes/menu.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/menu.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/menu.inc (original)
+++ branches/upstream/current-6/includes/menu.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.inc,v 1.255.2.34 2010/02/01 18:00:49 goba Exp $
+// $Id: menu.inc,v 1.255.2.38 2010/12/09 11:57:18 goba Exp $
/**
* @file
@@ -550,7 +550,7 @@
* path from the menu table, for example tabs.
* @return
* Returns the map with objects loaded as defined in the
- * $item['load_functions. $item['access'] becomes TRUE if the item is
+ * $item['load_functions']. $item['access'] becomes TRUE if the item is
* accessible, FALSE otherwise. $item['href'] is set according to the map.
* If an error occurs during calling the load_functions (like trying to load
* a non existing node) then this function return FALSE.
@@ -1509,14 +1509,15 @@
* @param $new_trail
* Menu trail to set, or NULL to use previously-set or calculated trail. If
* supplying a trail, use the same format as the return value (see below).
+ *
* @return
* Path to menu root of the current page, as an array of menu link items,
* starting with the site's home page. Each link item is an associative array
* with the following components:
- * - 'title': Title of the item.
- * - 'href': Drupal path of the item.
- * - 'localized_options': Options for passing into the l() function.
- * - 'type': A menu type constant, such as MENU_DEFAULT_LOCAL_TASK, or 0 to
+ * - title: Title of the item.
+ * - href: Drupal path of the item.
+ * - localized_options: Options for passing into the l() function.
+ * - type: A menu type constant, such as MENU_DEFAULT_LOCAL_TASK, or 0 to
* indicate it's not really in the menu (used for the home page item).
* If $new_trail is supplied, the value is saved in a static variable and
* returned. If $new_trail is not supplied, and there is a saved value from
@@ -1886,13 +1887,14 @@
* @param $item
* An array representing a menu link item. The only mandatory keys are
* link_path and link_title. Possible keys are:
- * - menu_name default is navigation
- * - weight default is 0
- * - expanded whether the item is expanded.
- * - options An array of options, @see l for more.
- * - mlid Set to an existing value, or 0 or NULL to insert a new link.
- * - plid The mlid of the parent.
- * - router_path The path of the relevant router item.
+ * - menu_name: Default is navigation.
+ * - weight: Default is 0.
+ * - expanded: Whether the item is expanded.
+ * - options: An array of options, see l() for more.
+ * - mlid: Set to an existing value, or 0 or NULL to insert a new link.
+ * - plid: The mlid of the parent.
+ * - router_path: The path of the relevant router item.
+ *
* @return
* The mlid of the saved menu link, or FALSE if the menu link could not be
* saved.
@@ -2430,6 +2432,7 @@
'file' => '',
'file path' => '',
'include file' => '',
+ 'module' => '',
);
// Calculate out the file to be included for each callback, if any.
Modified: branches/upstream/current-6/includes/module.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/module.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/module.inc (original)
+++ branches/upstream/current-6/includes/module.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: module.inc,v 1.115.2.3 2009/11/16 17:17:35 goba Exp $
+// $Id: module.inc,v 1.115.2.5 2010/12/15 14:50:25 goba Exp $
/**
* @file
Modified: branches/upstream/current-6/includes/path.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/path.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/path.inc (original)
+++ branches/upstream/current-6/includes/path.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: path.inc,v 1.19.2.4 2010/05/28 15:12:04 goba Exp $
+// $Id: path.inc,v 1.19.2.7 2010/11/04 10:27:46 goba Exp $
/**
* @file
@@ -74,7 +74,7 @@
// isn't a path that has this alias
elseif ($action == 'source' && !isset($no_src[$path_language][$path])) {
// Look for the value $path within the cached $map
- $src = '';
+ $src = FALSE;
if (!isset($map[$path_language]) || !($src = array_search($path, $map[$path_language]))) {
// Get the most fitting result falling back with alias without language
if ($src = db_result(db_query("SELECT src FROM {url_alias} WHERE dst = '%s' AND language IN('%s', '') ORDER BY language DESC, pid DESC", $path, $path_language))) {
@@ -152,10 +152,13 @@
* @param $index
* The index of the component, where each component is separated by a '/'
* (forward-slash), and where the first component has an index of 0 (zero).
+ * @param $path
+ * A path to break into components. Defaults to the path of the current page.
*
* @return
* The component specified by $index, or NULL if the specified component was
- * not found.
+ * not found. If called without arguments, it returns an array containing all
+ * the components of the current path.
*/
function arg($index = NULL, $path = NULL) {
static $arguments;
Modified: branches/upstream/current-6/includes/theme.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/theme.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/theme.inc (original)
+++ branches/upstream/current-6/includes/theme.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: theme.inc,v 1.415.2.27 2010/03/01 10:02:01 goba Exp $
+// $Id: theme.inc,v 1.415.2.28 2010/11/03 19:03:19 goba Exp $
/**
* @file
@@ -1244,6 +1244,7 @@
*
* @param $path
* Either the path of the image file (relative to base_path()) or a full URL.
+ * If this is a full URL, $getsize must be set to FALSE or nothing will be returned.
* @param $alt
* The alternative text for text-based browsers.
* @param $title
@@ -1252,6 +1253,8 @@
* Associative array of attributes to be placed in the img tag.
* @param $getsize
* If set to TRUE, the image's dimension are fetched and added as width/height attributes.
+ * Defaults to TRUE. Must be set to FALSE if $path is a full URL.
+ *
* @return
* A string containing the image tag.
*/
Added: branches/upstream/current-6/includes/unicode.entities.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/unicode.entities.inc?rev=2159&op=file
==============================================================================
--- branches/upstream/current-6/includes/unicode.entities.inc (added)
+++ branches/upstream/current-6/includes/unicode.entities.inc Fri Feb 18 18:59:17 2011
@@ -1,0 +1,266 @@
+<?php
+// $Id $
+
+/**
+ * @file
+ * (X)HTML entities, as defined in HTML 4.01.
+ *
+ * @see http://www.w3.org/TR/html401/sgml/entities.html
+ */
+
+$html_entities = array(
+ 'Á' => 'Ã',
+ 'á' => 'á',
+ 'Â' => 'Â',
+ 'â' => 'â',
+ '´' => '´',
+ 'Æ' => 'Æ',
+ 'æ' => 'æ',
+ 'À' => 'À',
+ 'à' => 'Ã ',
+ 'ℵ' => 'ℵ',
+ 'Α' => 'Α',
+ 'α' => 'α',
+ '&' => '&',
+ '∧' => '∧',
+ '∠' => '∠',
+ 'Å' => 'Ã
',
+ 'å' => 'Ã¥',
+ '≈' => '≈',
+ 'Ã' => 'Ã',
+ 'ã' => 'ã',
+ 'Ä' => 'Ä',
+ 'ä' => 'ä',
+ '„' => '„',
+ 'Β' => 'Î’',
+ 'β' => 'β',
+ '¦' => '¦',
+ '•' => '•',
+ '∩' => '∩',
+ 'Ç' => 'Ç',
+ 'ç' => 'ç',
+ '¸' => '¸',
+ '¢' => '¢',
+ 'Χ' => 'Χ',
+ 'χ' => 'χ',
+ 'ˆ' => 'ˆ',
+ '♣' => '♣',
+ '≅' => 'â‰
',
+ '©' => '©',
+ '↵' => '↵',
+ '∪' => '∪',
+ '¤' => '¤',
+ '†' => '†',
+ '‡' => '‡',
+ '↓' => '↓',
+ '⇓' => '⇓',
+ '°' => '°',
+ 'Δ' => 'Δ',
+ 'δ' => 'δ',
+ '♦' => '♦',
+ '÷' => '÷',
+ 'É' => 'É',
+ 'é' => 'é',
+ 'Ê' => 'Ê',
+ 'ê' => 'ê',
+ 'È' => 'È',
+ 'è' => 'è',
+ '∅' => 'âˆ
',
+ ' ' => ' ',
+ ' ' => ' ',
+ 'Ε' => 'Ε',
+ 'ε' => 'ε',
+ '≡' => '≡',
+ 'Η' => 'Η',
+ 'η' => 'η',
+ 'Ð' => 'Ã',
+ 'ð' => 'ð',
+ 'Ë' => 'Ë',
+ 'ë' => 'ë',
+ '€' => '€',
+ '∃' => '∃',
+ 'ƒ' => 'Æ’',
+ '∀' => '∀',
+ '½' => '½',
+ '¼' => '¼',
+ '¾' => '¾',
+ '⁄' => 'â„',
+ 'Γ' => 'Γ',
+ 'γ' => 'γ',
+ '≥' => '≥',
+ '↔' => '↔',
+ '⇔' => '⇔',
+ '♥' => '♥',
+ '…' => '…',
+ 'Í' => 'Ã',
+ 'í' => 'Ã',
+ 'Î' => 'ÃŽ',
+ 'î' => 'î',
+ '¡' => '¡',
+ 'Ì' => 'ÃŒ',
+ 'ì' => 'ì',
+ 'ℑ' => 'â„‘',
+ '∞' => '∞',
+ '∫' => '∫',
+ 'Ι' => 'Ι',
+ 'ι' => 'ι',
+ '¿' => '¿',
+ '∈' => '∈',
+ 'Ï' => 'Ã',
+ 'ï' => 'ï',
+ 'Κ' => 'Κ',
+ 'κ' => 'κ',
+ 'Λ' => 'Λ',
+ 'λ' => 'λ',
+ '⟨' => '〈',
+ '«' => '«',
+ '←' => 'â†',
+ '⇐' => 'â‡',
+ '⌈' => '⌈',
+ '“' => '“',
+ '≤' => '≤',
+ '⌊' => '⌊',
+ '∗' => '∗',
+ '◊' => 'â—Š',
+ '‎' => '‎',
+ '‹' => '‹',
+ '‘' => '‘',
+ '¯' => '¯',
+ '—' => '—',
+ 'µ' => 'µ',
+ '·' => '·',
+ '−' => '−',
+ 'Μ' => 'Îœ',
+ 'μ' => 'μ',
+ '∇' => '∇',
+ ' ' => 'Â ',
+ '–' => '–',
+ '≠' => '≠',
+ '∋' => '∋',
+ '¬' => '¬',
+ '∉' => '∉',
+ '⊄' => '⊄',
+ 'Ñ' => 'Ñ',
+ 'ñ' => 'ñ',
+ 'Ν' => 'Î',
+ 'ν' => 'ν',
+ 'Ó' => 'Ó',
+ 'ó' => 'ó',
+ 'Ô' => 'Ô',
+ 'ô' => 'ô',
+ 'Œ' => 'Å’',
+ 'œ' => 'Å“',
+ 'Ò' => 'Ã’',
+ 'ò' => 'ò',
+ '‾' => '‾',
+ 'Ω' => 'Ω',
+ 'ω' => 'ω',
+ 'Ο' => 'Ο',
+ 'ο' => 'ο',
+ '⊕' => '⊕',
+ '∨' => '∨',
+ 'ª' => 'ª',
+ 'º' => 'º',
+ 'Ø' => 'Ø',
+ 'ø' => 'ø',
+ 'Õ' => 'Õ',
+ 'õ' => 'õ',
+ '⊗' => '⊗',
+ 'Ö' => 'Ö',
+ 'ö' => 'ö',
+ '¶' => '¶',
+ '∂' => '∂',
+ '‰' => '‰',
+ '⊥' => '⊥',
+ 'Φ' => 'Φ',
+ 'φ' => 'φ',
+ 'Π' => 'Î ',
+ 'π' => 'Ï€',
+ 'ϖ' => 'Ï–',
+ '±' => '±',
+ '£' => '£',
+ '′' => '′',
+ '″' => '″',
+ '∏' => 'âˆ',
+ '∝' => 'âˆ',
+ 'Ψ' => 'Ψ',
+ 'ψ' => 'ψ',
+ '√' => '√',
+ '⟩' => '〉',
+ '»' => '»',
+ '→' => '→',
+ '⇒' => '⇒',
+ '⌉' => '⌉',
+ '”' => 'â€',
+ 'ℜ' => 'â„œ',
+ '®' => '®',
+ '⌋' => '⌋',
+ 'Ρ' => 'Ρ',
+ 'ρ' => 'Ï',
+ '‏' => 'â€',
+ '›' => '›',
+ '’' => '’',
+ '‚' => '‚',
+ 'Š' => 'Å ',
+ 'š' => 'Å¡',
+ '⋅' => 'â‹
',
+ '§' => '§',
+ '­' => 'Â',
+ 'Σ' => 'Σ',
+ 'σ' => 'σ',
+ 'ς' => 'Ï‚',
+ '∼' => '∼',
+ '♠' => 'â™ ',
+ '⊂' => '⊂',
+ '⊆' => '⊆',
+ '∑' => '∑',
+ '¹' => '¹',
+ '²' => '²',
+ '³' => '³',
+ '⊃' => '⊃',
+ '⊇' => '⊇',
+ 'ß' => 'ß',
+ 'Τ' => 'Τ',
+ 'τ' => 'Ï„',
+ '∴' => '∴',
+ 'Θ' => 'Θ',
+ 'θ' => 'θ',
+ 'ϑ' => 'Ï‘',
+ ' ' => ' ',
+ 'Þ' => 'Þ',
+ 'þ' => 'þ',
+ '˜' => 'Ëœ',
+ '×' => '×',
+ '™' => 'â„¢',
+ 'Ú' => 'Ú',
+ 'ú' => 'ú',
+ '↑' => '↑',
+ '⇑' => '⇑',
+ 'Û' => 'Û',
+ 'û' => 'û',
+ 'Ù' => 'Ù',
+ 'ù' => 'ù',
+ '¨' => '¨',
+ 'ϒ' => 'Ï’',
+ 'Υ' => 'Î¥',
+ 'υ' => 'Ï
',
+ 'Ü' => 'Ãœ',
+ 'ü' => 'ü',
+ '℘' => '℘',
+ 'Ξ' => 'Ξ',
+ 'ξ' => 'ξ',
+ 'Ý' => 'Ã',
+ 'ý' => 'ý',
+ '¥' => 'Â¥',
+ 'ÿ' => 'ÿ',
+ 'Ÿ' => 'Ÿ',
+ 'Ζ' => 'Ζ',
+ 'ζ' => 'ζ',
+ '‍' => 'â€',
+ '‌' => '‌',
+ '>' => '>',
+ '<' => '<',
+ '"' => '"',
+ // Add apostrophe (XML).
+ ''' => "'",
+);
Modified: branches/upstream/current-6/includes/unicode.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/unicode.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/includes/unicode.inc (original)
+++ branches/upstream/current-6/includes/unicode.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: unicode.inc,v 1.29 2007/12/28 12:02:50 dries Exp $
+// $Id: unicode.inc,v 1.29.2.2 2010/12/15 13:50:13 goba Exp $
/**
* Indicates an error during check for PHP unicode support.
@@ -319,40 +319,46 @@
}
/**
- * Decode all HTML entities (including numerical ones) to regular UTF-8 bytes.
- * Double-escaped entities will only be decoded once ("&lt;" becomes "<", not "<").
+ * Decodes all HTML entities (including numerical ones) to regular UTF-8 bytes.
+ *
+ * Double-escaped entities will only be decoded once ("&lt;" becomes "<",
+ * not "<"). Be careful when using this function, as decode_entities can revert
+ * previous sanitization efforts (<script> will become <script>).
*
* @param $text
* The text to decode entities in.
* @param $exclude
* An array of characters which should not be decoded. For example,
* array('<', '&', '"'). This affects both named and numerical entities.
+ *
+ * @return
+ * The input $text, with all HTML entities decoded once.
*/
function decode_entities($text, $exclude = array()) {
- static $table;
- // We store named entities in a table for quick processing.
- if (!isset($table)) {
- // Get all named HTML entities.
- $table = array_flip(get_html_translation_table(HTML_ENTITIES));
- // PHP gives us ISO-8859-1 data, we need UTF-8.
- $table = array_map('utf8_encode', $table);
- // Add apostrophe (XML)
- $table['''] = "'";
- }
- $newtable = array_diff($table, $exclude);
-
- // Use a regexp to select all entities in one pass, to avoid decoding double-escaped entities twice.
- return preg_replace('/&(#x?)?([A-Za-z0-9]+);/e', '_decode_entities("$1", "$2", "$0", $newtable, $exclude)', $text);
+ static $html_entities;
+ if (!isset($html_entities)) {
+ include_once './includes/unicode.entities.inc';
+ }
+
+ // Flip the exclude list so that we can do quick lookups later.
+ $exclude = array_flip($exclude);
+
+ // Use a regexp to select all entities in one pass, to avoid decoding
+ // double-escaped entities twice. The PREG_REPLACE_EVAL modifier 'e' is
+ // being used to allow for a callback (see
+ // http://php.net/manual/en/reference.pcre.pattern.modifiers).
+ return preg_replace('/&(#x?)?([A-Za-z0-9]+);/e', '_decode_entities("$1", "$2", "$0", $html_entities, $exclude)', $text);
}
/**
* Helper function for decode_entities
*/
-function _decode_entities($prefix, $codepoint, $original, &$table, &$exclude) {
+function _decode_entities($prefix, $codepoint, $original, &$html_entities, &$exclude) {
// Named entity
if (!$prefix) {
- if (isset($table[$original])) {
- return $table[$original];
+ // A named entity not in the exclude list.
+ if (isset($html_entities[$original]) && !isset($exclude[$html_entities[$original]])) {
+ return $html_entities[$original];
}
else {
return $original;
@@ -386,7 +392,7 @@
. chr(0x80 | ( $codepoint & 0x3F));
}
// Check for excluded characters
- if (in_array($str, $exclude)) {
+ if (isset($exclude[$str])) {
return $original;
}
else {
Modified: branches/upstream/current-6/install.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/install.php?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/install.php (original)
+++ branches/upstream/current-6/install.php Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: install.php,v 1.113.2.12 2010/05/09 14:13:31 dries Exp $
+// $Id: install.php,v 1.113.2.13 2010/12/06 06:50:56 goba Exp $
require_once './includes/install.inc';
@@ -529,7 +529,7 @@
drupal_set_title(st('Choose language'));
if (!empty($_GET['localize'])) {
$output = '<p>'. st('With the addition of an appropriate translation package, this installer is capable of proceeding in another language of your choice. To install and use Drupal in a language other than English:') .'</p>';
- $output .= '<ul><li>'. st('Determine if <a href="@translations" target="_blank">a translation of this Drupal version</a> is available in your language of choice. A translation is provided via a translation package; each translation package enables the display of a specific version of Drupal in a specific language. Not all languages are available for every version of Drupal.', array('@translations' => 'http://drupal.org/project/translations')) .'</li>';
+ $output .= '<ul><li>'. st('Determine if <a href="@translations" target="_blank">a translation of this Drupal version</a> is available in your language of choice. A translation is provided via a translation package; each translation package enables the display of a specific version of Drupal in a specific language. Not all languages are available for every version of Drupal.', array('@translations' => 'http://localize.drupal.org')) .'</li>';
$output .= '<li>'. st('If an alternative translation package of your choice is available, download and extract its contents to your Drupal root directory.') .'</li>';
$output .= '<li>'. st('Return to choose language using the second link below and select your desired language from the displayed list. Reloading the page allows the list to automatically adjust to the presence of new translation packages.') .'</li>';
$output .= '</ul><p>'. st('Alternatively, to install and use Drupal in English, or to defer the selection of an alternative language until after installation, select the first link below.') .'</p>';
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-6/modules/aggregator/aggregator.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/block/block.info (original)
+++ branches/upstream/current-6/modules/block/block.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blog/blog.info (original)
+++ branches/upstream/current-6/modules/blog/blog.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-6/modules/blogapi/blogapi.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/book/book.info (original)
+++ branches/upstream/current-6/modules/book/book.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/modules/book/book.pages.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/book/book.pages.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/book/book.pages.inc (original)
+++ branches/upstream/current-6/modules/book/book.pages.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: book.pages.inc,v 1.5.2.1 2008/08/13 23:59:13 drumm Exp $
+// $Id: book.pages.inc,v 1.5.2.2 2010/08/06 11:00:49 goba Exp $
/**
* @file
@@ -216,19 +216,15 @@
}
/**
- * AJAX callback to replace the book parent select options.
- *
- * This function is called when the selected book is changed. It updates the
- * cached form (either the node form or the book outline form) and returns
- * rendered output to be used to replace the select containing the possible
- * parent pages in the newly selected book.
- *
- * @param $build_id
- * The form's build_id.
- * @param $bid
- * A bid from from among those in the form's book select.
+ * Renders a new parent page select element when the book selection changes.
+ *
+ * This function is called via AJAX when the selected book is changed on a node
+ * or book outline form. It creates a new parent page select element, adds it
+ * to the cached form, and then returns the rendered element so it can be
+ * displayed on the form.
+ *
* @return
- * Prints the replacement HTML in JSON format.
+ * The rendered parent page select element.
*/
function book_form_update() {
$bid = $_POST['book']['bid'];
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/color/color.info (original)
+++ branches/upstream/current-6/modules/color/color.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.info (original)
+++ branches/upstream/current-6/modules/comment/comment.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.module (original)
+++ branches/upstream/current-6/modules/comment/comment.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: comment.module,v 1.617.2.16.2.1 2010/08/11 20:22:27 goba Exp $
+// $Id: comment.module,v 1.617.2.17 2010/08/11 20:35:47 goba Exp $
/**
* @file
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/contact/contact.info (original)
+++ branches/upstream/current-6/modules/contact/contact.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/modules/dblog/dblog.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/dblog/dblog.admin.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/dblog/dblog.admin.inc (original)
+++ branches/upstream/current-6/modules/dblog/dblog.admin.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: dblog.admin.inc,v 1.6.2.1 2008/09/17 05:47:53 goba Exp $
+// $Id: dblog.admin.inc,v 1.6.2.2 2010/12/09 11:58:30 goba Exp $
/**
* @file
@@ -215,7 +215,7 @@
$filters = array();
foreach (_dblog_get_message_types() as $type) {
- $types[$type] = $type;
+ $types[$type] = t($type);
}
if (!empty($types)) {
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/dblog/dblog.info (original)
+++ branches/upstream/current-6/modules/dblog/dblog.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/filter/filter.info (original)
+++ branches/upstream/current-6/modules/filter/filter.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/filter/filter.module (original)
+++ branches/upstream/current-6/modules/filter/filter.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: filter.module,v 1.204.2.15 2010/05/28 14:40:02 goba Exp $
+// $Id: filter.module,v 1.204.2.17 2010/11/03 14:11:43 goba Exp $
/**
* @file
@@ -965,23 +965,30 @@
}
/**
- * Filters XSS. Based on kses by Ulf Harnhammar, see
- * http://sourceforge.net/projects/kses
- *
- * For examples of various XSS attacks, see:
- * http://ha.ckers.org/xss.html
+ * Filters an HTML string to prevent cross-site-scripting (XSS) vulnerabilities.
+ *
+ * Based on kses by Ulf Harnhammar, see http://sourceforge.net/projects/kses.
+ * For examples of various XSS attacks, see http://ha.ckers.org/xss.html.
*
* This code does four things:
- * - Removes characters and constructs that can trick browsers
- * - Makes sure all HTML entities are well-formed
- * - Makes sure all HTML tags and attributes are well-formed
- * - Makes sure no HTML tags contain URLs with a disallowed protocol (e.g. javascript:)
+ * - Removes characters and constructs that can trick browsers.
+ * - Makes sure all HTML entities are well-formed.
+ * - Makes sure all HTML tags and attributes are well-formed.
+ * - Makes sure no HTML tags contain URLs with a disallowed protocol (e.g.
+ * javascript:).
*
* @param $string
- * The string with raw HTML in it. It will be stripped of everything that can cause
- * an XSS attack.
+ * The string with raw HTML in it. It will be stripped of everything that can
+ * cause an XSS attack.
* @param $allowed_tags
* An array of allowed tags.
+ *
+ * @return
+ * An XSS safe version of $string, or an empty string if $string is not
+ * valid UTF-8.
+ *
+ * @see drupal_validate_utf8()
+ * @ingroup sanitization
*/
function filter_xss($string, $allowed_tags = array('a', 'em', 'strong', 'cite', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd')) {
// Only operate on valid UTF-8 strings. This is necessary to prevent cross
@@ -1212,7 +1219,7 @@
function filter_xss_bad_protocol($string, $decode = TRUE) {
static $allowed_protocols;
if (!isset($allowed_protocols)) {
- $allowed_protocols = array_flip(variable_get('filter_allowed_protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal', 'rtsp')));
+ $allowed_protocols = array_flip(variable_get('filter_allowed_protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'tel', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal', 'rtsp')));
}
// Get the plain text representation of the attribute value (i.e. its meaning).
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.info (original)
+++ branches/upstream/current-6/modules/forum/forum.info Fri Feb 18 18:59:17 2011
@@ -7,8 +7,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/modules/forum/forum.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/forum/forum.module?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.module (original)
+++ branches/upstream/current-6/modules/forum/forum.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: forum.module,v 1.448.2.8 2010/03/01 11:32:00 goba Exp $
+// $Id: forum.module,v 1.448.2.9 2010/12/15 12:37:01 goba Exp $
/**
* @file
@@ -255,7 +255,7 @@
$node->tid = $term_id;
}
}
- $old_tid = db_result(db_query_range("SELECT t.tid FROM {term_node} t INNER JOIN {node} n ON t.vid = n.vid WHERE n.nid = %d ORDER BY t.vid DESC", $node->nid, 0, 1));
+ $old_tid = db_result(db_query_range("SELECT f.tid FROM {forum} f INNER JOIN {node} n ON f.vid = n.vid WHERE n.nid = %d ORDER BY f.vid DESC", $node->nid, 0, 1));
if ($old_tid && isset($node->tid) && ($node->tid != $old_tid) && !empty($node->shadow)) {
// A shadow copy needs to be created. Retain new term and add old term.
$node->taxonomy[] = $old_tid;
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/help/help.info (original)
+++ branches/upstream/current-6/modules/help/help.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/locale/locale.info (original)
+++ branches/upstream/current-6/modules/locale/locale.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/modules/locale/locale.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/locale/locale.module?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/locale/locale.module (original)
+++ branches/upstream/current-6/modules/locale/locale.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: locale.module,v 1.212.2.10 2010/03/04 00:15:28 goba Exp $
+// $Id: locale.module,v 1.212.2.11 2010/12/06 06:50:56 goba Exp $
/**
* @file
@@ -25,14 +25,14 @@
$output .= '<p>'. t('Beyond translation of the Drupal interface, the locale module provides a feature set tailored to the needs of a multi-lingual site. Language negotiation allows your site to automatically change language based on the domain or path used for each request. Users may (optionally) select their preferred language on their <em>My account</em> page, and your site can be configured to honor a web browser\'s preferred language settings. Your site content can be created in (and translated to) any enabled language, and each post may have a language-appropriate alias for each of its translations. The locale module works in concert with the <a href="@content-help">content translation module</a> to manage translated content.', array('@content-help' => url('admin/help/translation'))) .'</p>';
$output .= '<p>'. t('Translations may be provided by:') .'</p>';
$output .= '<ul><li>'. t("translating the original text via the locale module's integrated web interface, or") .'</li>';
- $output .= '<li>'. t('importing files from a set of existing translations, known as a translation package. A translation package enables the display of a specific version of Drupal in a specific language, and contain files in the Gettext Portable Object (<em>.po</em>) format. Although not all languages are available for every version of Drupal, translation packages for many languages are available for download from the <a href="@translations">Drupal translation page</a>.', array('@translations' => 'http://drupal.org/project/translations')) .'</li></ul>';
+ $output .= '<li>'. t('importing files from a set of existing translations, known as a translation package. A translation package enables the display of a specific version of Drupal in a specific language, and contain files in the Gettext Portable Object (<em>.po</em>) format. Although not all languages are available for every version of Drupal, translation packages for many languages are available for download from the <a href="@translations">Drupal translation page</a>.', array('@translations' => 'http://localize.drupal.org')) .'</li></ul>';
$output .= '<p>'. t('If an existing translation package does not meet your needs, the Gettext Portable Object (<em>.po</em>) files within a package may be modified, or new <em>.po</em> files may be created, using a desktop Gettext editor. The locale module\'s <a href="@import">import</a> feature allows the translated strings from a new or modified <em>.po</em> file to be added to your site. The locale module\'s <a href="@export">export</a> feature generates files from your site\'s translated strings, that can either be shared with others or edited offline by a Gettext translation editor.', array('@import' => url('admin/build/translate/import'), '@export' => url('admin/build/translate/export'))) .'</p>';
$output .= '<p>'. t('For more information, see the online handbook entry for <a href="@locale">Locale module</a>.', array('@locale' => 'http://drupal.org/handbook/modules/locale/')) .'</p>';
return $output;
case 'admin/settings/language':
$output = '<p>'. t("This page provides an overview of your site's enabled languages. If multiple languages are available and enabled, the text on your site interface may be translated, registered users may select their preferred language on the <em>My account</em> page, and site authors may indicate a specific language when creating posts. The site's default language is used for anonymous visitors and for users who have not selected a preferred language.") .'</p>';
$output .= '<p>'. t('For each language available on the site, use the <em>edit</em> link to configure language details, including name, an optional language-specific path or domain, and whether the language is natively presented either left-to-right or right-to-left. These languages also appear in the <em>Language</em> selection when creating a post of a content type with multilingual support.') .'</p>';
- $output .= '<p>'. t('Use the <a href="@add-language">add language page</a> to enable additional languages (and automatically import files from a translation package, if available), the <a href="@search">translate interface page</a> to locate strings for manual translation, or the <a href="@import">import page</a> to add translations from individual <em>.po</em> files. A number of contributed translation packages containing <em>.po</em> files are available on the <a href="@translations">Drupal.org translations page</a>.', array('@add-language' => url('admin/settings/language/add'), '@search' => url('admin/build/translate/search'), '@import' => url('admin/build/translate/import'), '@translations' => 'http://drupal.org/project/translations')) .'</p>';
+ $output .= '<p>'. t('Use the <a href="@add-language">add language page</a> to enable additional languages (and automatically import files from a translation package, if available), the <a href="@search">translate interface page</a> to locate strings for manual translation, or the <a href="@import">import page</a> to add translations from individual <em>.po</em> files. A number of contributed translation packages containing <em>.po</em> files are available on the <a href="@translations">Drupal.org translations page</a>.', array('@add-language' => url('admin/settings/language/add'), '@search' => url('admin/build/translate/search'), '@import' => url('admin/build/translate/import'), '@translations' => 'http://localize.drupal.org')) .'</p>';
return $output;
case 'admin/settings/language/add':
return '<p>'. t('Add all languages to be supported by your site. If your desired language is not available in the <em>Language name</em> drop-down, click <em>Custom language</em> and provide a language code and other details manually. When providing a language code manually, be sure to enter a standardized language code, since this code may be used by browsers to determine an appropriate display language.') .'</p>';
@@ -50,7 +50,7 @@
return $output;
case 'admin/build/translate/import':
$output = '<p>'. t('This page imports the translated strings contained in an individual Gettext Portable Object (<em>.po</em>) file. Normally distributed as part of a translation package (each translation package may contain several <em>.po</em> files), a <em>.po</em> file may need to be imported after off-line editing in a Gettext translation editor. Importing an individual <em>.po</em> file may be a lengthy process.') .'</p>';
- $output .= '<p>'. t('Note that the <em>.po</em> files within a translation package are imported automatically (if available) when new modules or themes are enabled, or as new languages are added. Since this page only allows the import of one <em>.po</em> file at a time, it may be simpler to download and extract a translation package into your Drupal installation directory and <a href="@language-add">add the language</a> (which automatically imports all <em>.po</em> files within the package). Translation packages are available for download on the <a href="@translations">Drupal translation page</a>.', array('@language-add' => url('admin/settings/language/add'), '@translations' => 'http://drupal.org/project/translations')) .'</p>';
+ $output .= '<p>'. t('Note that the <em>.po</em> files within a translation package are imported automatically (if available) when new modules or themes are enabled, or as new languages are added. Since this page only allows the import of one <em>.po</em> file at a time, it may be simpler to download and extract a translation package into your Drupal installation directory and <a href="@language-add">add the language</a> (which automatically imports all <em>.po</em> files within the package). Translation packages are available for download on the <a href="@translations">Drupal translation page</a>.', array('@language-add' => url('admin/settings/language/add'), '@translations' => 'http://localize.drupal.org')) .'</p>';
return $output;
case 'admin/build/translate/export':
return '<p>'. t('This page exports the translated strings used by your site. An export file may be in Gettext Portable Object (<em>.po</em>) form, which includes both the original string and the translation (used to share translations with others), or in Gettext Portable Object Template (<em>.pot</em>) form, which includes the original strings only (used to create new translations with a Gettext translation editor).') .'</p>';
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/menu/menu.info (original)
+++ branches/upstream/current-6/modules/menu/menu.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.info (original)
+++ branches/upstream/current-6/modules/node/node.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.module (original)
+++ branches/upstream/current-6/modules/node/node.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: node.module,v 1.947.2.24 2010/06/02 12:11:07 goba Exp $
+// $Id: node.module,v 1.947.2.29 2010/12/15 12:53:33 goba Exp $
/**
* @file
@@ -816,7 +816,13 @@
}
/**
- * Prepare node for save and allow modules to make changes.
+ * Prepares a node for saving by populating teaser, author, and creation date.
+ *
+ * @param object|array $node
+ * A node object or array.
+ *
+ * @return
+ * A validated node object with a populated teaser, author, and creation date.
*/
function node_submit($node) {
global $user;
@@ -1232,7 +1238,10 @@
}
if ($weight = (int)variable_get('node_rank_recent', 5)) {
// Exponential decay with half-life of 6 months, starting at last indexed node
- $ranking[] = '%d * POW(2, (GREATEST(MAX(n.created), MAX(n.changed), MAX(c.last_comment_timestamp)) - %d) * 6.43e-8)';
+ // c.last_comment_timestamp may be NULL. Since both MAX(anynumber, NULL) and
+ // GREATEST(anynumber, NULL) return NULL, we use COALESCE(MAX(c.last_comment_timestamp), 0)
+ // to prevent it from being NULL.
+ $ranking[] = '%d * POW(2, (GREATEST(MAX(n.created), MAX(n.changed), COALESCE(MAX(c.last_comment_timestamp), 0)) - %d) * 6.43e-8)';
$arguments2[] = $weight;
$arguments2[] = (int)variable_get('node_cron_last', 0);
$join2 .= ' LEFT JOIN {node_comment_statistics} c ON c.nid = i.sid';
@@ -2187,13 +2196,13 @@
}
/**
- * This function will call module invoke to get a list of grants and then
- * write them to the database. It is called at node save, and should be
- * called by modules whenever something other than a node_save causes
- * the permissions on a node to change.
- *
- * This function is the only function that should write to the node_access
- * table.
+ * Gets the list of node access grants and writes them to the database.
+ *
+ * This function is called when a node is saved, and can also be called by
+ * modules if something other than a node save causes node access permissions
+ * to change. It collects all node access grants for the node from
+ * hook_node_access_records() implementations and saves the collected
+ * grants to the database.
*
* @param $node
* The $node to acquire grants for.
@@ -2217,12 +2226,12 @@
}
/**
- * This function will write a list of grants to the database, deleting
- * any pre-existing grants. If a realm is provided, it will only
- * delete grants from that realm, but it will always delete a grant
- * from the 'all' realm. Modules which utilize node_access can
- * use this function when doing mass updates due to widespread permission
- * changes.
+ * Writes a list of grants to the database, deleting any previously saved ones.
+ *
+ * If a realm is provided, it will only delete grants from that realm, but it
+ * will always delete a grant from the 'all' realm. Modules that utilize
+ * node_access can use this function when doing mass updates due to widespread
+ * permission changes.
*
* @param $node
* The $node being written to. All that is necessary is that it contain a nid.
@@ -2685,7 +2694,7 @@
function node_assign_owner_action(&$node, $context) {
$node->uid = $context['owner_uid'];
$owner_name = db_result(db_query("SELECT name FROM {users} WHERE uid = %d", $context['owner_uid']));
- watchdog('action', 'Changed owner of @type %title to uid %name.', array('@type' => node_get_types('type', $node), '%title' => $node->title, '%name' => $owner_name));
+ watchdog('action', 'Changed owner of @type %title to uid %name.', array('@type' => node_get_types('name', $node), '%title' => $node->title, '%name' => $owner_name));
}
function node_assign_owner_action_form($context) {
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/openid/openid.info (original)
+++ branches/upstream/current-6/modules/openid/openid.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/modules/openid/openid.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/openid/openid.install?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/openid/openid.install (original)
+++ branches/upstream/current-6/modules/openid/openid.install Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: openid.install,v 1.3.2.1.2.1 2010/08/11 20:22:27 goba Exp $
+// $Id: openid.install,v 1.3.2.2 2010/08/11 20:35:48 goba Exp $
/**
* Implementation of hook_install().
Modified: branches/upstream/current-6/modules/openid/openid.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/openid/openid.module?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/openid/openid.module (original)
+++ branches/upstream/current-6/modules/openid/openid.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: openid.module,v 1.19.2.9.2.1 2010/08/11 20:22:27 goba Exp $
+// $Id: openid.module,v 1.19.2.11 2010/08/11 20:35:48 goba Exp $
/**
* @file
@@ -111,7 +111,7 @@
'#weight' => -1,
'#description' => l(t('What is OpenID?'), 'http://openid.net/', array('external' => TRUE)),
);
- $form['openid.return_to'] = array('#type' => 'hidden', '#value' => url('openid/authenticate', array('absolute' => TRUE, 'query' => drupal_get_destination())));
+ $form['openid.return_to'] = array('#type' => 'hidden', '#value' => url('openid/authenticate', array('absolute' => TRUE, 'query' => user_login_destination())));
}
elseif ($form_id == 'user_register' && isset($_SESSION['openid']['values'])) {
// We were unable to auto-register a new user. Prefill the registration
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/path/path.info (original)
+++ branches/upstream/current-6/modules/path/path.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/php/php.info (original)
+++ branches/upstream/current-6/modules/php/php.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/ping/ping.info (original)
+++ branches/upstream/current-6/modules/ping/ping.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/poll/poll.info (original)
+++ branches/upstream/current-6/modules/poll/poll.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/profile/profile.info (original)
+++ branches/upstream/current-6/modules/profile/profile.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.info (original)
+++ branches/upstream/current-6/modules/search/search.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.module (original)
+++ branches/upstream/current-6/modules/search/search.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: search.module,v 1.250.2.10 2010/05/28 15:20:35 goba Exp $
+// $Id: search.module,v 1.250.2.13 2010/12/13 18:45:16 goba Exp $
/**
* @file
@@ -911,7 +911,7 @@
* Default: 'ORDER BY score DESC'
*
* @return
- * An array of SIDs for the search results.
+ * An array of objects for the search results.
*
* @ingroup search
*/
@@ -988,15 +988,14 @@
* for all of the search features to work.
*
* There are three ways to interact with the search system:
- * - Specifically for searching nodes, you can implement nodeapi('update index')
- * and nodeapi('search result'). However, note that the search system already
- * indexes all visible output of a node, i.e. everything displayed normally
- * by hook_view() and hook_nodeapi('view'). This is usually sufficient.
- * You should only use this mechanism if you want additional, non-visible data
- * to be indexed.
+ * - Specifically for searching nodes, you can implement
+ * hook_nodeapi('update index') and hook_nodeapi('search result'). However,
+ * note that the search system already indexes all visible output of a node,
+ * i.e. everything displayed normally by hook_view() and hook_nodeapi('view').
+ * This is usually sufficient. You should only use this mechanism if you want
+ * additional, non-visible data to be indexed.
* - Implement hook_search(). This will create a search tab for your module on
- * the /search page with a simple keyword search form. You may optionally
- * implement hook_search_item() to customize the display of your results.
+ * the /search page with a simple keyword search form.
* - Implement hook_update_index(). This allows your module to use Drupal's
* HTML indexing mechanism for searching full text efficiently.
*
@@ -1019,7 +1018,7 @@
* @param $prompt
* A piece of text to put before the form (e.g. "Enter your keywords")
* @return
- * An HTML string containing the search form.
+ * A Form API array for the search form.
*/
function search_form(&$form_state, $action = '', $keys = '', $type = NULL, $prompt = NULL) {
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/statistics/statistics.info (original)
+++ branches/upstream/current-6/modules/statistics/statistics.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/syslog/syslog.info (original)
+++ branches/upstream/current-6/modules/syslog/syslog.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Added: branches/upstream/current-6/modules/syslog/syslog.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/syslog/syslog.install?rev=2159&op=file
==============================================================================
--- branches/upstream/current-6/modules/syslog/syslog.install (added)
+++ branches/upstream/current-6/modules/syslog/syslog.install Fri Feb 18 18:59:17 2011
@@ -1,0 +1,16 @@
+<?php
+// $Id: syslog.install,v 1.1.2.2 2010/09/06 11:08:44 goba Exp $
+
+/**
+ * @file
+ * Install, update and uninstall functions for the syslog module.
+ */
+
+/**
+ * Implements hook_uninstall().
+ */
+function syslog_uninstall() {
+ variable_del('syslog_identity');
+ variable_del('syslog_facility');
+ variable_del('syslog_format');
+}
Modified: branches/upstream/current-6/modules/syslog/syslog.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/syslog/syslog.module?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/syslog/syslog.module (original)
+++ branches/upstream/current-6/modules/syslog/syslog.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: syslog.module,v 1.14.2.2 2008/07/24 06:52:43 dries Exp $
+// $Id: syslog.module,v 1.14.2.3 2010/09/06 11:08:44 goba Exp $
/**
* @file
@@ -38,6 +38,13 @@
}
function syslog_admin_settings() {
+ $form['syslog_identity'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Syslog identity'),
+ '#default_value' => variable_get('syslog_identity', 'drupal'),
+ '#description' => t('A string that will be prepended to every message logged to Syslog. If you have multiple sites logging to the same Syslog log file, a unique identity per site makes it easy to tell the log entries apart. For more information on syslog, see <a href="@syslog_help">Syslog help</a>.', array(
+ '@syslog_help' => url('admin/help/syslog'))),
+ );
$form['syslog_facility'] = array(
'#type' => 'select',
'#title' => t('Send events to this syslog facility'),
@@ -73,7 +80,7 @@
if (!$log_init) {
$log_init = TRUE;
- openlog('drupal', LOG_NDELAY, variable_get('syslog_facility', DEFAULT_SYSLOG_FACILITY));
+ openlog(variable_get('syslog_identity', 'drupal'), LOG_NDELAY, variable_get('syslog_facility', DEFAULT_SYSLOG_FACILITY));
}
syslog($entry['severity'], theme('syslog_format', $entry));
Modified: branches/upstream/current-6/modules/system/page.tpl.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/page.tpl.php?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/page.tpl.php (original)
+++ branches/upstream/current-6/modules/system/page.tpl.php Fri Feb 18 18:59:17 2011
@@ -1,10 +1,9 @@
<?php
-// $Id: page.tpl.php,v 1.11.2.1 2009/04/30 00:13:31 goba Exp $
+// $Id: page.tpl.php,v 1.11.2.2 2010/08/06 11:13:42 goba Exp $
/**
- * @file page.tpl.php
- *
- * Theme implementation to display a single Drupal page.
+ * @file
+ * Displays a single Drupal page.
*
* Available variables:
*
@@ -14,62 +13,68 @@
* - $css: An array of CSS files for the current page.
* - $directory: The directory the theme is located in, e.g. themes/garland or
* themes/garland/minelli.
- * - $is_front: TRUE if the current page is the front page. Used to toggle the mission statement.
+ * - $is_front: TRUE if the current page is the front page.
* - $logged_in: TRUE if the user is registered and signed in.
* - $is_admin: TRUE if the user has permission to access administration pages.
*
* Page metadata:
* - $language: (object) The language the site is being displayed in.
* $language->language contains its textual representation.
- * $language->dir contains the language direction. It will either be 'ltr' or 'rtl'.
- * - $head_title: A modified version of the page title, for use in the TITLE tag.
- * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
+ * $language->dir contains the language direction. It will either be 'ltr' or
+ * 'rtl'.
+ * - $head_title: A modified version of the page title, for use in the TITLE
+ * element.
+ * - $head: Markup for the HEAD element (including meta tags, keyword tags, and
* so on).
* - $styles: Style tags necessary to import all CSS files for the page.
* - $scripts: Script tags necessary to load the JavaScript files and settings
* for the page.
* - $body_classes: A set of CSS classes for the BODY tag. This contains flags
- * indicating the current layout (multiple columns, single column), the current
- * path, whether the user is logged in, and so on.
+ * indicating the current layout (multiple columns, single column), the
+ * current path, whether the user is logged in, and so on.
*
* Site identity:
* - $front_page: The URL of the front page. Use this instead of $base_path,
- * when linking to the front page. This includes the language domain or prefix.
+ * when linking to the front page. This includes the language domain or
+ * prefix.
* - $logo: The path to the logo image, as defined in theme configuration.
- * - $site_name: The name of the site, empty when display has been disabled
- * in theme settings.
+ * - $site_name: The name of the site, empty when display has been disabled in
+ * theme settings.
* - $site_slogan: The slogan of the site, empty when display has been disabled
* in theme settings.
- * - $mission: The text of the site mission, empty when display has been disabled
- * in theme settings.
+ * - $mission: The text of the site mission, empty when display has been
+ * disabled in theme settings.
*
* Navigation:
- * - $search_box: HTML to display the search box, empty if search has been disabled.
- * - $primary_links (array): An array containing primary navigation links for the
- * site, if they have been configured.
- * - $secondary_links (array): An array containing secondary navigation links for
+ * - $search_box: HTML to display the search box, empty if search has been
+ * disabled.
+ * - $primary_links (array): An array containing primary navigation links for
* the site, if they have been configured.
+ * - $secondary_links (array): An array containing secondary navigation links
+ * for the site, if they have been configured.
*
- * Page content (in order of occurrance in the default page.tpl.php):
+ * Page content (in order of occurrence in the default page.tpl.php):
* - $left: The HTML for the left sidebar.
- *
* - $breadcrumb: The breadcrumb trail for the current page.
* - $title: The page title, for use in the actual HTML content.
* - $help: Dynamic help text, mostly for admin pages.
- * - $messages: HTML for status and error messages. Should be displayed prominently.
- * - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the view
- * and edit tabs when displaying a node).
- *
+ * - $messages: HTML for status and error messages. Should be displayed
+ * prominently.
+ * - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
+ * view and edit tabs when displaying a node).
* - $content: The main content of the current Drupal page.
- *
* - $right: The HTML for the right sidebar.
+ * - $node: The node object, if there is an automatically-loaded node associated
+ * with the page, and the node ID is the second argument in the page's path
+ * (e.g. node/12345 and node/12345/revisions, but not comment/reply/12345).
*
* Footer/closing data:
* - $feed_icons: A string of all feed icons for the current page.
* - $footer_message: The footer message as defined in the admin settings.
* - $footer : The footer region.
* - $closure: Final closing markup from any modules that have altered the page.
- * This variable should always be output last, after all other dynamic content.
+ * This variable should always be output last, after all other dynamic
+ * content.
*
* @see template_preprocess()
* @see template_preprocess_page()
Modified: branches/upstream/current-6/modules/system/system.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.admin.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.admin.inc (original)
+++ branches/upstream/current-6/modules/system/system.admin.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: system.admin.inc,v 1.63.2.14 2010/03/01 10:20:28 goba Exp $
+// $Id: system.admin.inc,v 1.63.2.16 2010/09/06 10:49:14 goba Exp $
/**
* @file
@@ -503,17 +503,6 @@
}
if ($key) {
- // Include the theme's theme-settings.php file
- $filename = './'. str_replace("/$key.info", '', $themes[$key]->filename) .'/theme-settings.php';
- if (!file_exists($filename) and !empty($themes[$key]->info['base theme'])) {
- // If the theme doesn't have a theme-settings.php file, use the base theme's.
- $base = $themes[$key]->info['base theme'];
- $filename = './'. str_replace("/$base.info", '', $themes[$base]->filename) .'/theme-settings.php';
- }
- if (file_exists($filename)) {
- require_once $filename;
- }
-
// Call engine-specific settings.
$function = $themes[$key]->prefix .'_engine_settings';
if (function_exists($function)) {
@@ -523,16 +512,36 @@
$form['engine_specific'] = array_merge($form['engine_specific'], $group);
}
}
- // Call theme-specific settings.
- $function = $key .'_settings';
- if (!function_exists($function)) {
- $function = $themes[$key]->prefix .'_settings';
- }
- if (function_exists($function)) {
- $group = $function($settings);
- if (!empty($group)) {
- $form['theme_specific'] = array('#type' => 'fieldset', '#title' => t('Theme-specific settings'), '#description' => t('These settings only exist for the %theme theme and all the styles based on it.', array('%theme' => $themes[$key]->info['name'])));
- $form['theme_specific'] = array_merge($form['theme_specific'], $group);
+
+ // Create a list which includes the current theme and all its base themes.
+ if (isset($themes[$key]->base_themes)) {
+ $theme_keys = array_keys($themes[$key]->base_themes);
+ $theme_keys[] = $key;
+ }
+ else {
+ $theme_keys = array($key);
+ }
+
+ // Process the theme and all its base themes.
+ foreach ($theme_keys as $theme) {
+ // Include the theme-settings.php file.
+ $filename = './'. str_replace("/$theme.info", '', $themes[$theme]->filename) .'/theme-settings.php';
+ if (file_exists($filename)) {
+ require_once $filename;
+ }
+
+ $function = $theme .'_settings';
+ if (!function_exists($function)) {
+ $function = $themes[$theme]->prefix .'_settings';
+ }
+ if (function_exists($function)) {
+ $group = $function($settings);
+ if (!empty($group)) {
+ $form['theme_specific']['#type'] = 'fieldset';
+ $form['theme_specific']['#title'] = t('Theme-specific settings');
+ $form['theme_specific']['#description'] = t('These settings only exist for the %theme theme and all the styles based on it.', array('%theme' => $themes[$theme]->info['name']));
+ $form['theme_specific'] = array_merge($form['theme_specific'], $group);
+ }
}
}
}
@@ -628,15 +637,23 @@
// Get current list of modules.
$files = module_rebuild_cache();
- uasort($files, 'system_sort_modules_by_info_name');
+ // Remove hidden modules from display list.
+ $visible_files = $files;
+ foreach ($visible_files as $filename => $file) {
+ if (!empty($file->info['hidden'])) {
+ unset($visible_files[$filename]);
+ }
+ }
+
+ uasort($visible_files, 'system_sort_modules_by_info_name');
if (!empty($form_state['storage'])) {
- return system_modules_confirm_form($files, $form_state['storage']);
+ return system_modules_confirm_form($visible_files, $form_state['storage']);
}
$dependencies = array();
// Store module list for validation callback.
- $form['validation_modules'] = array('#type' => 'value', '#value' => $files);
+ $form['validation_modules'] = array('#type' => 'value', '#value' => $visible_files);
// Create storage for disabled modules as browser will disable checkboxes.
$form['disabled_modules'] = array('#type' => 'value', '#value' => array());
@@ -644,7 +661,7 @@
// Traverse the files, checking for compatibility
$incompatible_core = array();
$incompatible_php = array();
- foreach ($files as $filename => $file) {
+ foreach ($visible_files as $filename => $file) {
// Ensure this module is compatible with this version of core.
if (!isset($file->info['core']) || $file->info['core'] != DRUPAL_CORE_COMPATIBILITY) {
$incompatible_core[$file->name] = $file->name;
@@ -659,7 +676,7 @@
$disabled = array();
$throttle = array();
// Traverse the files retrieved and build the form.
- foreach ($files as $filename => $file) {
+ foreach ($visible_files as $filename => $file) {
$form['name'][$filename] = array('#value' => $file->info['name']);
$form['version'][$filename] = array('#value' => $file->info['version']);
$form['description'][$filename] = array('#value' => t($file->info['description']));
@@ -681,18 +698,19 @@
// Check for missing dependencies.
if (is_array($file->info['dependencies'])) {
foreach ($file->info['dependencies'] as $dependency) {
- if (!isset($files[$dependency]) || !$files[$dependency]->status) {
- if (isset($files[$dependency])) {
+ if (!isset($files[$dependency])) {
+ $dependencies[] = t('@module (<span class="admin-missing">missing</span>)', array('@module' => drupal_ucfirst($dependency)));
+ $disabled[] = $filename;
+ $form['disabled_modules']['#value'][$filename] = FALSE;
+ }
+ // Only display visible modules.
+ elseif (isset($visible_files[$dependency])) {
+ if ($files[$dependency]->status) {
+ $dependencies[] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $files[$dependency]->info['name']));
+ }
+ else {
$dependencies[] = t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $files[$dependency]->info['name']));
}
- else {
- $dependencies[] = t('@module (<span class="admin-missing">missing</span>)', array('@module' => drupal_ucfirst($dependency)));
- $disabled[] = $filename;
- $form['disabled_modules']['#value'][$filename] = FALSE;
- }
- }
- else {
- $dependencies[] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $files[$dependency]->info['name']));
}
}
@@ -709,13 +727,16 @@
// Mark dependents disabled so user can not remove modules being depended on.
$dependents = array();
foreach ($file->info['dependents'] as $dependent) {
- if ($files[$dependent]->status == 1) {
- $dependents[] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $files[$dependent]->info['name']));
- $disabled[] = $filename;
- $form['disabled_modules']['#value'][$filename] = TRUE;
- }
- else {
- $dependents[] = t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $files[$dependent]->info['name']));
+ // Hidden modules are unset already.
+ if (isset($visible_files[$dependent])) {
+ if ($files[$dependent]->status == 1) {
+ $dependents[] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $files[$dependent]->info['name']));
+ $disabled[] = $filename;
+ $form['disabled_modules']['#value'][$filename] = TRUE;
+ }
+ else {
+ $dependents[] = t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $files[$dependent]->info['name']));
+ }
}
}
Modified: branches/upstream/current-6/modules/system/system.css
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.css?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.css (original)
+++ branches/upstream/current-6/modules/system/system.css Fri Feb 18 18:59:17 2011
@@ -1,4 +1,4 @@
-/* $Id: system.css,v 1.48 2008/01/09 09:56:39 goba Exp $ */
+/* $Id: system.css,v 1.48.2.1 2010/11/14 14:16:29 goba Exp $ */
/*
** HTML elements
@@ -189,7 +189,7 @@
width: 14em;
}
dl.multiselect dd.a, dl.multiselect dd.a .form-item {
- width: 8em;
+ width: 10em;
}
dl.multiselect dt, dl.multiselect dd {
float: left; /* LTR */
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.info (original)
+++ branches/upstream/current-6/modules/system/system.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.install (original)
+++ branches/upstream/current-6/modules/system/system.install Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: system.install,v 1.238.2.23 2010/05/28 11:51:20 goba Exp $
+// $Id: system.install,v 1.238.2.25 2010/11/03 12:29:24 goba Exp $
/**
* Test and report Drupal installation requirements.
@@ -629,7 +629,7 @@
'not null' => TRUE,
'default' => 0),
'status' => array(
- 'description' => 'A flag indicating whether file is temporary (1) or permanent (0).',
+ 'description' => 'A flag indicating whether file is temporary (0) or permanent (1).',
'type' => 'int',
'not null' => TRUE,
'default' => 0),
@@ -2672,27 +2672,31 @@
function system_update_6054() {
$ret = array();
- $schema['semaphore'] = array(
- 'fields' => array(
- 'name' => array(
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- 'default' => ''),
- 'value' => array(
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- 'default' => ''),
- 'expire' => array(
- 'type' => 'float',
- 'size' => 'big',
- 'not null' => TRUE),
- ),
- 'indexes' => array('expire' => array('expire')),
- 'primary key' => array('name'),
- );
- db_create_table($ret, 'semaphore', $schema['semaphore']);
+ // The table may have already been added by update_fix_d6_requirements(), so
+ // check for its existence before creating.
+ if (!db_table_exists('semaphore')) {
+ $schema['semaphore'] = array(
+ 'fields' => array(
+ 'name' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ 'default' => ''),
+ 'value' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ 'default' => ''),
+ 'expire' => array(
+ 'type' => 'float',
+ 'size' => 'big',
+ 'not null' => TRUE),
+ ),
+ 'indexes' => array('expire' => array('expire')),
+ 'primary key' => array('name'),
+ );
+ db_create_table($ret, 'semaphore', $schema['semaphore']);
+ }
return $ret;
}
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.module (original)
+++ branches/upstream/current-6/modules/system/system.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: system.module,v 1.585.2.52.2.1 2010/08/11 20:22:27 goba Exp $
+// $Id: system.module,v 1.585.2.59 2010/12/15 21:11:23 goba Exp $
/**
* @file
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.18');
+define('VERSION', '6.20');
/**
* Core API compatibility.
@@ -1923,7 +1923,7 @@
*/
function system_check_http_request() {
// Try to get the content of the front page via drupal_http_request().
- $result = drupal_http_request(url('', array('absolute' => TRUE)));
+ $result = drupal_http_request(url('', array('absolute' => TRUE)), array(), 'GET', NULL, 0);
// We only care that we get a http response - this means that Drupal
// can make a http request.
$works = isset($result->code) && ($result->code >= 100) && ($result->code < 600);
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.module (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: taxonomy.module,v 1.414.2.14 2010/05/11 10:19:04 goba Exp $
+// $Id: taxonomy.module,v 1.414.2.16 2010/08/06 11:10:57 goba Exp $
/**
* @file
@@ -509,8 +509,9 @@
$terms = empty($node->nid) ? array() : taxonomy_node_get_terms($node);
}
else {
- // After preview the terms must be converted to objects.
- if (isset($form_state['node_preview'])) {
+ // After a preview or form reload, the terms must be converted to objects.
+ reset($node->taxonomy);
+ if (!is_object(current($node->taxonomy))) {
$node->taxonomy = taxonomy_preview_terms($node);
}
$terms = $node->taxonomy;
@@ -1329,7 +1330,9 @@
}
/**
- * Implode a list of tags of a certain vocabulary into a string.
+ * Implodes a list of tags of a certain vocabulary into a string.
+ *
+ * @see drupal_explode_tags()
*/
function taxonomy_implode_tags($tags, $vid = NULL) {
$typed_tags = array();
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/throttle/throttle.info (original)
+++ branches/upstream/current-6/modules/throttle/throttle.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/tracker/tracker.info (original)
+++ branches/upstream/current-6/modules/tracker/tracker.info Fri Feb 18 18:59:17 2011
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/translation/translation.info (original)
+++ branches/upstream/current-6/modules/translation/translation.info Fri Feb 18 18:59:17 2011
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/modules/translation/translation.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/translation/translation.module?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/translation/translation.module (original)
+++ branches/upstream/current-6/modules/translation/translation.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: translation.module,v 1.23.2.4 2009/01/14 23:34:07 goba Exp $
+// $Id: translation.module,v 1.23.2.6 2010/12/15 12:27:56 goba Exp $
/**
* @file
@@ -163,7 +163,7 @@
unset($translations[$node->language]);
$languages = language_list();
foreach ($languages as $langcode => $language) {
- if (isset($translations[$langcode])) {
+ if (isset($translations[$langcode]) && $translations[$langcode]->status) {
$links["node_translation_$langcode"] = array(
'title' => $language->native,
'href' => 'node/'. $translations[$langcode]->nid,
@@ -227,6 +227,7 @@
db_query("UPDATE {node} SET tnid = %d, translate = %d WHERE nid = %d", $tnid, 0, $node->translation_source->nid);
}
db_query("UPDATE {node} SET tnid = %d, translate = %d WHERE nid = %d", $tnid, 0, $node->nid);
+ $node->tnid = $tnid;
}
break;
@@ -289,7 +290,7 @@
if (is_numeric($tnid) && $tnid) {
if (!isset($translations[$tnid])) {
$translations[$tnid] = array();
- $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.language FROM {node} n WHERE n.tnid = %d'), $tnid);
+ $result = db_query(db_rewrite_sql('SELECT n.nid, n.type, n.uid, n.status, n.title, n.language FROM {node} n WHERE n.tnid = %d'), $tnid);
while ($node = db_fetch_object($result)) {
$translations[$tnid][$node->language] = $node;
}
@@ -336,8 +337,12 @@
*/
function translation_translation_link_alter(&$links, $path) {
if ($paths = translation_path_get_translations($path)) {
+ // Path can only start with "node/$nid" or "node/$nid/" here.
+ $path = explode('/', $path);
+ $node = node_load($path[1]);
+ $translations = translation_node_get_translations($node->tnid);
foreach ($links as $langcode => $link) {
- if (isset($paths[$langcode])) {
+ if (isset($paths[$langcode]) && $translations[$langcode]->status) {
// Translation in a different node.
$links[$langcode]['href'] = $paths[$langcode];
}
Modified: branches/upstream/current-6/modules/trigger/trigger.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/trigger/trigger.admin.inc?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/trigger/trigger.admin.inc (original)
+++ branches/upstream/current-6/modules/trigger/trigger.admin.inc Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: trigger.admin.inc,v 1.5.4.1 2010/08/11 20:22:27 goba Exp $
+// $Id: trigger.admin.inc,v 1.5.2.1 2010/08/11 20:35:48 goba Exp $
/**
* @file
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/trigger/trigger.info (original)
+++ branches/upstream/current-6/modules/trigger/trigger.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/modules/trigger/trigger.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/trigger/trigger.module?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/trigger/trigger.module (original)
+++ branches/upstream/current-6/modules/trigger/trigger.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: trigger.module,v 1.13.2.3 2009/06/08 16:34:57 goba Exp $
+// $Id: trigger.module,v 1.13.2.4 2010/06/30 09:38:50 goba Exp $
/**
* @file
@@ -105,6 +105,7 @@
'title' => $nice_name,
'page callback' => 'trigger_assign',
'page arguments' => array($module),
+ 'access callback' => 'trigger_access_check',
'access arguments' => array($module),
'type' => MENU_LOCAL_TASK,
'file' => 'trigger.admin.inc',
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.info (original)
+++ branches/upstream/current-6/modules/update/update.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/upload/upload.info (original)
+++ branches/upstream/current-6/modules/upload/upload.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/upload/upload.module (original)
+++ branches/upstream/current-6/modules/upload/upload.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: upload.module,v 1.197.2.6.2.1 2010/08/11 20:22:27 goba Exp $
+// $Id: upload.module,v 1.197.2.8 2010/12/13 18:40:49 goba Exp $
/**
* @file
@@ -17,8 +17,8 @@
$output .= '<p>'. t('Users with the upload files permission can upload attachments to posts. Uploads may be enabled for specific content types on the content types settings page. Each user role can be customized to limit or control the file size of uploads, or the maximum dimension of image files.') .'</p>';
$output .= '<p>'. t('For more information, see the online handbook entry for <a href="@upload">Upload module</a>.', array('@upload' => 'http://drupal.org/handbook/modules/upload/')) .'</p>';
return $output;
- case 'admin/settings/upload':
- return '<p>'. t('Users with the <a href="@permissions">upload files permission</a> can upload attachments. Users with the <a href="@permissions">view uploaded files permission</a> can view uploaded attachments. You can choose which post types can take attachments on the <a href="@types">content types settings</a> page.', array('@permissions' => url('admin/user/permissions'), '@types' => url('admin/settings/types'))) .'</p>';
+ case 'admin/settings/uploads':
+ return '<p>'. t('Users with the <a href="@permissions">upload files permission</a> can upload attachments. Users with the <a href="@permissions">view uploaded files permission</a> can view uploaded attachments. You can choose which post types can take attachments on the <a href="@types">content types settings</a> page.', array('@permissions' => url('admin/user/permissions', array('fragment' => 'module-upload')), '@types' => url('admin/content/types'))) .'</p>';
}
}
@@ -196,7 +196,7 @@
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.
+ // 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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.info (original)
+++ branches/upstream/current-6/modules/user/user.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.module (original)
+++ branches/upstream/current-6/modules/user/user.module Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.892.2.25 2010/06/02 12:47:58 goba Exp $
+// $Id: user.module,v 1.892.2.28 2010/11/04 09:16:45 goba Exp $
/**
* @file
@@ -130,27 +130,29 @@
/**
* Fetch a user object.
*
- * @param $array
- * An associative array of attributes to search for in selecting the
- * user, such as user name or e-mail address.
+ * @param $user_info
+ * Information about the user to load, consisting of one of the following:
+ * - An associative array whose keys are fields in the {users} table (such as
+ * uid, name, pass, mail, status) and whose values are the field's value.
+ * - A numeric user ID.
*
* @return
* A fully-loaded $user object upon successful user load or FALSE if user
* cannot be loaded.
*/
-function user_load($array = array()) {
+function user_load($user_info = array()) {
// Dynamically compose a SQL query:
$query = array();
$params = array();
- if (is_numeric($array)) {
- $array = array('uid' => $array);
- }
- elseif (!is_array($array)) {
+ if (is_numeric($user_info)) {
+ $user_info = array('uid' => $user_info);
+ }
+ elseif (!is_array($user_info)) {
return FALSE;
}
- foreach ($array as $key => $value) {
+ foreach ($user_info as $key => $value) {
if ($key == 'uid' || $key == 'status') {
$query[] = "$key = %d";
$params[] = $value;
@@ -180,7 +182,7 @@
while ($role = db_fetch_object($result)) {
$user->roles[$role->rid] = $role->name;
}
- user_module_invoke('load', $array, $user);
+ user_module_invoke('load', $user_info, $user);
}
else {
$user = FALSE;
@@ -235,7 +237,7 @@
if ($value === NULL) {
unset($data[$key]);
}
- else {
+ elseif (!empty($key)) {
$data[$key] = $value;
}
}
@@ -2527,3 +2529,18 @@
return empty($groups) ? FALSE : $groups;
}
+
+/**
+ * Prepare a destination query string for use in combination with drupal_goto().
+ *
+ * Used to direct the user back to the referring page after completing
+ * the openid login. This function prevents the login page from being
+ * returned because that page will give an access denied message to an
+ * authenticated user.
+ *
+ * @see drupal_get_destination()
+ */
+function user_login_destination() {
+ $destination = drupal_get_destination();
+ return $destination == 'destination=user%2Flogin' ? 'destination=user' : $destination;
+}
Modified: branches/upstream/current-6/robots.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/robots.txt?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/robots.txt (original)
+++ branches/upstream/current-6/robots.txt Fri Feb 18 18:59:17 2011
@@ -1,4 +1,4 @@
-# $Id: robots.txt,v 1.9.2.1 2008/12/10 20:12:19 goba Exp $
+# $Id: robots.txt,v 1.9.2.2 2010/09/06 10:37:16 goba Exp $
#
# robots.txt
#
@@ -25,7 +25,6 @@
Disallow: /modules/
Disallow: /profiles/
Disallow: /scripts/
-Disallow: /sites/
Disallow: /themes/
# Files
Disallow: /CHANGELOG.txt
Modified: branches/upstream/current-6/sites/default/default.settings.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/sites/default/default.settings.php?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/sites/default/default.settings.php (original)
+++ branches/upstream/current-6/sites/default/default.settings.php Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: default.settings.php,v 1.8.2.4 2009/09/14 12:59:18 goba Exp $
+// $Id: default.settings.php,v 1.8.2.5 2010/12/15 13:21:14 goba Exp $
/**
* @file
@@ -91,6 +91,26 @@
*/
$db_url = 'mysql://username:password@localhost/databasename';
$db_prefix = '';
+
+/**
+ * Database default collation.
+ *
+ * All data stored in Drupal is in UTF-8. Certain databases, such as MySQL,
+ * support different algorithms for comparing, indexing, and sorting characters;
+ * a so called "collation". The default collation of a database normally works
+ * for many use-cases, but depending on the language(s) of the stored data, it
+ * may be necessary to use a different collation.
+ * Important:
+ * - Only set or change this value BEFORE installing Drupal, unless you know
+ * what you are doing.
+ * - All database tables and columns should be in the same collation. Otherwise,
+ * string comparisons performed for table JOINs will be significantly slower.
+ * - Especially when storing data in German or Russian on MySQL 5.1+, you want
+ * to use the 'utf8_unicode_ci' collation instead.
+ *
+ * @see http://drupal.org/node/772678
+ */
+# $db_collation = 'utf8_general_ci';
/**
* Access control for update.php script
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/themes/bluemarine/bluemarine.info (original)
+++ branches/upstream/current-6/themes/bluemarine/bluemarine.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/chameleon.info (original)
+++ branches/upstream/current-6/themes/chameleon/chameleon.info Fri Feb 18 18:59:17 2011
@@ -12,8 +12,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/marvin/marvin.info (original)
+++ branches/upstream/current-6/themes/chameleon/marvin/marvin.info Fri Feb 18 18:59:17 2011
@@ -7,8 +7,8 @@
core = 6.x
base theme = chameleon
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/garland.info (original)
+++ branches/upstream/current-6/themes/garland/garland.info Fri Feb 18 18:59:17 2011
@@ -7,8 +7,8 @@
stylesheets[all][] = style.css
stylesheets[print][] = print.css
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/minnelli/minnelli.info (original)
+++ branches/upstream/current-6/themes/garland/minnelli/minnelli.info Fri Feb 18 18:59:17 2011
@@ -6,8 +6,8 @@
base theme = garland
stylesheets[all][] = minnelli.css
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/themes/garland/print.css
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/print.css?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/print.css (original)
+++ branches/upstream/current-6/themes/garland/print.css Fri Feb 18 18:59:17 2011
@@ -1,4 +1,4 @@
-/* $Id: print.css,v 1.3 2007/09/06 21:23:32 goba Exp $ */
+/* $Id: print.css,v 1.3.2.1 2010/08/06 11:37:38 goba Exp $ */
/**
* Garland, for Drupal 5.0
@@ -19,7 +19,7 @@
display: none;
}
-body.sidebars, body.sideber-left, body.sidebar-right, body {
+body.sidebars, body.sidebar-left, body.sidebar-right, body {
width: 640px;
}
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=2159&op=diff
==============================================================================
--- branches/upstream/current-6/themes/pushbutton/pushbutton.info (original)
+++ branches/upstream/current-6/themes/pushbutton/pushbutton.info Fri Feb 18 18:59:17 2011
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2010-08-11
-version = "6.18"
+; Information added by drupal.org packaging script on 2010-12-15
+version = "6.20"
project = "drupal"
-datestamp = "1281558392"
+datestamp = "1292447788"
Modified: branches/upstream/current-6/update.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/update.php?rev=2159&op=diff
==============================================================================
--- branches/upstream/current-6/update.php (original)
+++ branches/upstream/current-6/update.php Fri Feb 18 18:59:17 2011
@@ -1,5 +1,5 @@
<?php
-// $Id: update.php,v 1.252.2.3 2009/03/30 11:15:11 goba Exp $
+// $Id: update.php,v 1.252.2.4 2010/11/03 12:29:24 goba Exp $
/**
* @file
@@ -517,6 +517,31 @@
'primary key' => array('cid'),
);
db_create_table($ret, 'cache_block', $schema['cache_block']);
+
+ // Create the semaphore table now -- the menu system after 6.15 depends on
+ // this table, and menu code runs in updates prior to the table being
+ // created in its original update function, system_update_6054().
+ $schema['semaphore'] = array(
+ 'fields' => array(
+ 'name' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ 'default' => ''),
+ 'value' => array(
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ 'default' => ''),
+ 'expire' => array(
+ 'type' => 'float',
+ 'size' => 'big',
+ 'not null' => TRUE),
+ ),
+ 'indexes' => array('expire' => array('expire')),
+ 'primary key' => array('name'),
+ );
+ db_create_table($ret, 'semaphore', $schema['semaphore']);
}
return $ret;
More information about the Pkg-drupal-commits
mailing list