[Pkg-drupal-commits] r2099 - in /branches/drupal6: ./ debian/ includes/ modules/aggregator/ modules/block/ modules/blog/ modules/blogapi/ modules/book/ modules/color/ modules/comment/ modules/contact/ modules/dblog/ modules/filter/ modules/forum/ modules/help/ modules/locale/ modules/menu/ modules/node/ modules/openid/ modules/path/ modules/php/ modules/ping/ modules/poll/ modules/profile/ modules/search/ modules/statistics/ modules/syslog/ modules/system/ modules/taxonomy/ modules/throttle/ modules/tracker/ modules/translation/ modules/trigger/ modules/update/ modules/upload/ modules/user/ themes/bluemarine/ themes/chameleon/ themes/chameleon/marvin/ themes/garland/ themes/garland/minnelli/ themes/pushbutton/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Mon Jan 11 20:46:48 UTC 2010
Author: luigi
Date: Mon Jan 11 20:46:47 2010
New Revision: 2099
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2099
Log:
New upstream release (Closes: #561726), Fixes several XSS vulnerabilities (Closes: #562165) (Ref: SA-CORE-2009-009, CVE-2009-4369, CVE-2009-4370, CVE-2009-4371)
Modified:
branches/drupal6/.htaccess
branches/drupal6/CHANGELOG.txt
branches/drupal6/debian/changelog
branches/drupal6/includes/actions.inc
branches/drupal6/includes/cache.inc
branches/drupal6/includes/common.inc
branches/drupal6/includes/form.inc
branches/drupal6/includes/menu.inc
branches/drupal6/includes/module.inc
branches/drupal6/includes/path.inc
branches/drupal6/includes/xmlrpcs.inc
branches/drupal6/modules/aggregator/aggregator.info
branches/drupal6/modules/block/block.info
branches/drupal6/modules/block/block.module
branches/drupal6/modules/blog/blog.info
branches/drupal6/modules/blogapi/blogapi.info
branches/drupal6/modules/book/book.info
branches/drupal6/modules/color/color.info
branches/drupal6/modules/comment/comment.info
branches/drupal6/modules/contact/contact.admin.inc
branches/drupal6/modules/contact/contact.info
branches/drupal6/modules/contact/contact.module
branches/drupal6/modules/dblog/dblog.info
branches/drupal6/modules/filter/filter.info
branches/drupal6/modules/forum/forum.info
branches/drupal6/modules/help/help.info
branches/drupal6/modules/locale/locale.info
branches/drupal6/modules/menu/menu.admin.inc
branches/drupal6/modules/menu/menu.info
branches/drupal6/modules/node/node.info
branches/drupal6/modules/node/node.module
branches/drupal6/modules/openid/openid.inc
branches/drupal6/modules/openid/openid.info
branches/drupal6/modules/openid/openid.module
branches/drupal6/modules/path/path.info
branches/drupal6/modules/php/php.info
branches/drupal6/modules/ping/ping.info
branches/drupal6/modules/ping/ping.module
branches/drupal6/modules/poll/poll.info
branches/drupal6/modules/profile/profile.info
branches/drupal6/modules/search/search.info
branches/drupal6/modules/search/search.module
branches/drupal6/modules/statistics/statistics.info
branches/drupal6/modules/syslog/syslog.info
branches/drupal6/modules/system/system.info
branches/drupal6/modules/system/system.install
branches/drupal6/modules/system/system.module
branches/drupal6/modules/taxonomy/taxonomy.info
branches/drupal6/modules/throttle/throttle.info
branches/drupal6/modules/tracker/tracker.info
branches/drupal6/modules/translation/translation.info
branches/drupal6/modules/trigger/trigger.info
branches/drupal6/modules/update/update.compare.inc
branches/drupal6/modules/update/update.info
branches/drupal6/modules/update/update.module
branches/drupal6/modules/update/update.report.inc
branches/drupal6/modules/upload/upload.info
branches/drupal6/modules/user/user-profile.tpl.php
branches/drupal6/modules/user/user.info
branches/drupal6/modules/user/user.module
branches/drupal6/themes/bluemarine/bluemarine.info
branches/drupal6/themes/chameleon/chameleon.info
branches/drupal6/themes/chameleon/marvin/marvin.info
branches/drupal6/themes/garland/garland.info
branches/drupal6/themes/garland/minnelli/minnelli.info
branches/drupal6/themes/pushbutton/pushbutton.info
Modified: branches/drupal6/.htaccess
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/.htaccess?rev=2099&op=diff
==============================================================================
--- branches/drupal6/.htaccess (original)
+++ branches/drupal6/.htaccess Mon Jan 11 20:46:47 2010
@@ -66,8 +66,14 @@
# Cache all files for 2 weeks after access (A).
ExpiresDefault A1209600
- # Do not cache dynamically generated pages.
- ExpiresByType text/html A1
+ <FilesMatch \.php$>
+ # Do not allow PHP scripts to be cached unless they explicitly send cache
+ # headers themselves. Otherwise all scripts would have to overwrite the
+ # headers set by mod_expires if they want another caching behavior. This may
+ # fail if an error occurs early in the bootstrap process, and it may cause
+ # problems if a non-Drupal PHP file is installed in a subdirectory.
+ ExpiresActive Off
+ </FilesMatch>
</IfModule>
# Various rewrite rules.
@@ -107,4 +113,4 @@
RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
</IfModule>
-# $Id: .htaccess,v 1.90.2.3 2008/12/10 20:04:08 goba Exp $
+# $Id: .htaccess,v 1.90.2.4 2009/12/07 12:00:40 goba Exp $
Modified: branches/drupal6/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/CHANGELOG.txt?rev=2099&op=diff
==============================================================================
--- branches/drupal6/CHANGELOG.txt (original)
+++ branches/drupal6/CHANGELOG.txt Mon Jan 11 20:46:47 2010
@@ -1,4 +1,9 @@
-// $Id: CHANGELOG.txt,v 1.253.2.33 2009/09/16 19:34:13 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.35 2009/12/16 20:47:10 goba Exp $
+
+Drupal 6.15, 2009-12-16
+----------------------
+- Fixed security issues (Cross site scripting), see SA-CORE-2009-009.
+- Fixed a variety of other bugs.
Drupal 6.14, 2009-09-16
----------------------
@@ -89,7 +94,7 @@
- Fixed Views compatibility issues (Views for Drupal 6 requires Drupal 6.3+).
- Fixed a variety of small bugs.
-Drupal 6.2, 2008-04-09
+Drupal 6.2, 2008-04-09
----------------------
- Fixed a variety of small bugs.
- Fixed a security issue (Access bypasses), see SA-2008-026.
@@ -201,6 +206,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.21, 2009-12-16
+-----------------------
+- Fixed a security issue (Cross site scripting), see SA-CORE-2009-009.
+- Fixed a variety of small bugs.
+
Drupal 5.20, 2009-09-16
-----------------------
- Avoid security problems resulting from writing Drupal 6-style menu declarations.
@@ -242,7 +252,7 @@
-----------------------
- fixed a variety of small bugs.
- fixed security issues, (Cross site request forgery and Cross site scripting), see SA-2008-073
-- updated robots.txt and .htaccess to match current file use.
+- updated robots.txt and .htaccess to match current file use.
Drupal 5.12, 2008-10-22
-----------------------
Modified: branches/drupal6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/changelog?rev=2099&op=diff
==============================================================================
--- branches/drupal6/debian/changelog (original)
+++ branches/drupal6/debian/changelog Mon Jan 11 20:46:47 2010
@@ -1,3 +1,11 @@
+drupal6 (6.15-1) UNRELEASED; urgency=low
+
+ * New upstream release (Closes: #561726)
+ - Fixes several XSS vulnerabilities (Closes: #562165)
+ (Ref: SA-CORE-2009-009, CVE-2009-4369, CVE-2009-4370, CVE-2009-4371)
+
+ -- Luigi Gangitano <luigi at debian.org> Mon, 11 Jan 2010 19:47:13 +0100
+
drupal6 (6.14-1) unstable; urgency=low
* New upstream release
Modified: branches/drupal6/includes/actions.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/actions.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/includes/actions.inc (original)
+++ branches/drupal6/includes/actions.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: actions.inc,v 1.8.2.9 2009/08/10 10:39:49 goba Exp $
+// $Id: actions.inc,v 1.8.2.10 2009/11/06 08:14:05 goba Exp $
/**
* @file
@@ -167,17 +167,21 @@
}
/**
- * Retrieve all action instances from the database.
- *
- * Compare with actions_list() which gathers actions by
- * invoking hook_action_info(). The two are synchronized
- * by visiting /admin/build/actions (when actions.module is
- * enabled) which runs actions_synchronize().
- *
- * @return
- * Associative array keyed by action ID. Each value is
- * an associative array with keys 'callback', 'description',
- * 'type' and 'configurable'.
+ * Retrieves all action instances from the database.
+ *
+ * Compare with actions_list(), which gathers actions by invoking
+ * hook_action_info(). The actions returned by this function and the actions
+ * returned by actions_list() are partially synchronized. Non-configurable
+ * actions from hook_action_info() implementations are put into the database
+ * when actions_synchronize() is called, which happens when
+ * admin/settings/actions is visited. Configurable actions are not added to
+ * the database until they are configured in the user interface, in which case
+ * a database row is created for each configuration of each action.
+ *
+ * @return
+ * Associative array keyed by action ID. Each value is an
+ * associative array with keys 'callback', 'description', 'type' and
+ * 'configurable'.
*/
function actions_get_all_actions() {
$actions = array();
Modified: branches/drupal6/includes/cache.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/cache.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/includes/cache.inc (original)
+++ branches/drupal6/includes/cache.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: cache.inc,v 1.17.2.3 2009/08/10 10:43:55 goba Exp $
+// $Id: cache.inc,v 1.17.2.4 2009/12/16 17:30:00 goba Exp $
/**
* Return data from the persistent cache. Data may be stored as either plain text or as serialized data.
@@ -169,7 +169,7 @@
else {
if ($wildcard) {
if ($cid == '*') {
- db_query("DELETE FROM {". $table ."}");
+ db_query("TRUNCATE TABLE {". $table ."}");
}
else {
db_query("DELETE FROM {". $table ."} WHERE cid LIKE '%s%%'", $cid);
Modified: branches/drupal6/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/common.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/includes/common.inc (original)
+++ branches/drupal6/includes/common.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.756.2.69 2009/09/16 19:34:14 goba Exp $
+// $Id: common.inc,v 1.756.2.74 2009/12/16 20:47:10 goba Exp $
/**
* @file
@@ -617,7 +617,7 @@
return;
}
- if ($errno & (E_ALL ^ E_NOTICE ^ E_DEPRECATED)) {
+ if ($errno & (E_ALL ^ E_DEPRECATED ^ E_NOTICE)) {
$types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice', 2048 => 'strict warning', 4096 => 'recoverable fatal error');
// For database errors, we want the line number/file name of the place that
@@ -1110,7 +1110,7 @@
$output .= drupal_attributes($value['attributes']);
}
- if ($value['value'] != '') {
+ if (isset($value['value']) && $value['value'] != '') {
$output .= '>'. (is_array($value['value']) ? format_xml_elements($value['value']) : check_plain($value['value'])) .'</'. $value['key'] .">\n";
}
else {
@@ -2009,8 +2009,7 @@
// 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.
- [\n\r] # Remove line breaks.
+ /\*([^*\\\\]|\*(?!/))+\*/ # Remove comments that are not CSS hacks.
>x', '\1', $contents);
}
@@ -2662,7 +2661,7 @@
function drupal_cron_run() {
// Try to allocate enough time to run all the hook_cron implementations.
if (function_exists('set_time_limit')) {
- @set_time_limit($time_limit);
+ @set_time_limit(240);
}
// Fetch the cron semaphore
Modified: branches/drupal6/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/form.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/includes/form.inc (original)
+++ branches/drupal6/includes/form.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.265.2.28 2009/09/16 17:54:19 goba Exp $
+// $Id: form.inc,v 1.265.2.31 2009/12/07 15:54:52 goba Exp $
/**
* @defgroup forms Form builder functions
@@ -48,7 +48,7 @@
/**
* Retrieves a form from a constructor function, or from the cache if
- * the form was built in a previous page-load. The form is then passesed
+ * the form was built in a previous page-load. The form is then passed
* on for processing, after and rendered for display if necessary.
*
* @param $form_id
@@ -276,7 +276,8 @@
* $form_state = array();
* $form_state['values']['name'] = 'robo-user';
* $form_state['values']['mail'] = 'robouser at example.com';
- * $form_state['values']['pass'] = 'password';
+ * $form_state['values']['pass']['pass1'] = 'password';
+ * $form_state['values']['pass']['pass2'] = 'password';
* $form_state['values']['op'] = t('Create new account');
* drupal_execute('user_register', $form_state);
*
@@ -2314,11 +2315,17 @@
* array('my_function_2', array()),
* ),
* 'finished' => 'my_finished_callback',
+ * 'file' => 'path_to_file_containing_myfunctions',
* );
* batch_set($batch);
* // only needed if not inside a form _submit handler :
* batch_process();
* @endcode
+ *
+ * Note: if the batch 'title', 'init_message', 'progress_message', or
+ * 'error_message' could contain any user input, it is the responsibility of
+ * the code calling batch_set() to sanitize them first with a function like
+ * check_plain() or filter_xss().
*
* Sample batch operations:
* @code
@@ -2387,38 +2394,37 @@
*/
/**
- * Open a new batch.
+ * Opens a new batch.
*
* @param $batch
- * An array defining the batch. The following keys can be used:
- * 'operations': an array of function calls to be performed.
- * Example:
- * @code
- * array(
- * array('my_function_1', array($arg1)),
- * array('my_function_2', array($arg2_1, $arg2_2)),
- * )
- * @endcode
- * All the other values below are optional.
- * batch_init() provides default values for the messages.
- * 'title': title for the progress page.
- * Defaults to t('Processing').
- * 'init_message': message displayed while the processing is initialized.
- * Defaults to t('Initializing.').
- * 'progress_message': message displayed while processing the batch.
- * Available placeholders are @current, @remaining, @total and @percent.
- * Defaults to t('Remaining @remaining of @total.').
- * 'error_message': message displayed if an error occurred while processing
- * the batch.
- * Defaults to t('An error has occurred.').
- * 'finished': the name of a function to be executed after the batch has
- * completed. This should be used to perform any result massaging that
- * may be needed, and possibly save data in $_SESSION for display after
- * final page redirection.
- * 'file': the path to the file containing the definitions of the
- * 'operations' and 'finished' functions, for instance if they don't
- * reside in the original '.module' file. The path should be relative to
- * the base_path(), and thus should be built using drupal_get_path().
+ * An array defining the batch. The following keys can be used -- only
+ * 'operations' is required, and batch_init() provides default values for
+ * the messages.
+ * - 'operations': Array of function calls to be performed.
+ * Example:
+ * @code
+ * array(
+ * array('my_function_1', array($arg1)),
+ * array('my_function_2', array($arg2_1, $arg2_2)),
+ * )
+ * @endcode
+ * - 'title': Title for the progress page. Only safe strings should be passed.
+ * Defaults to t('Processing').
+ * - 'init_message': Message displayed while the processing is initialized.
+ * Defaults to t('Initializing.').
+ * - 'progress_message': Message displayed while processing the batch.
+ * Available placeholders are @current, @remaining, @total, @percentage,
+ * @estimate and @elapsed. Defaults to t('Completed @current of @total.').
+ * - 'error_message': Message displayed if an error occurred while processing
+ * the batch. Defaults to t('An error has occurred.').
+ * - 'finished': Name of a function to be executed after the batch has
+ * completed. This should be used to perform any result massaging that
+ * may be needed, and possibly save data in $_SESSION for display after
+ * final page redirection.
+ * - 'file': Path to the file containing the definitions of the
+ * 'operations' and 'finished' functions, for instance if they don't
+ * reside in the main .module file. The path should be relative to
+ * base_path(), and thus should be built using drupal_get_path().
*
* Operations are added as new batch sets. Batch sets are used to ensure
* clean code independence, ensuring that several batches submitted by
@@ -2473,7 +2479,7 @@
}
/**
- * Process the batch.
+ * Processes the batch.
*
* Unless the batch has been marked with 'progressive' = FALSE, the function
* issues a drupal_goto and thus ends page execution.
@@ -2540,7 +2546,7 @@
}
/**
- * Retrieve the current batch.
+ * Retrieves the current batch.
*/
function &batch_get() {
static $batch = array();
Modified: branches/drupal6/includes/menu.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/menu.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/includes/menu.inc (original)
+++ branches/drupal6/includes/menu.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.inc,v 1.255.2.31 2009/04/27 12:50:13 goba Exp $
+// $Id: menu.inc,v 1.255.2.32 2009/10/06 11:59:05 goba Exp $
/**
* @file
@@ -1503,7 +1503,25 @@
}
/**
- * Set (or get) the active trail for the current page - the path to root in the menu tree.
+ * Sets or gets the active trail (path to root menu root) of the current page.
+ *
+ * @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
+ * 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
+ * a previous call, the saved value is returned. If $new_trail is not supplied
+ * and there is no saved value, the path to the current page is calculated,
+ * saved as the static value, and returned.
*/
function menu_set_active_trail($new_trail = NULL) {
static $trail;
@@ -1566,7 +1584,9 @@
}
/**
- * Get the active trail for the current page - the path to root in the menu tree.
+ * Gets the active trail (path to root menu root) of the current page.
+ *
+ * See menu_set_active_trail() for details of return value.
*/
function menu_get_active_trail() {
return menu_set_active_trail();
Modified: branches/drupal6/includes/module.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/module.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/includes/module.inc (original)
+++ branches/drupal6/includes/module.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: module.inc,v 1.115.2.1 2009/02/16 10:32:10 goba Exp $
+// $Id: module.inc,v 1.115.2.3 2009/11/16 17:17:35 goba Exp $
/**
* @file
@@ -243,13 +243,25 @@
/**
* Load a module include file.
+ *
+ * Examples:
+ * @code
+ * // Load node.admin.inc from the node module.
+ * module_load_include('inc', 'node', 'node.admin');
+ * // Load content_types.inc from the node module.
+ * module_load_include('inc', 'node', 'content_types');
+ * @endcode
+ *
+ * Do not use this function to load an install file. Use module_load_install()
+ * instead.
*
* @param $type
* The include file's type (file extension).
* @param $module
* The module to which the include file belongs.
* @param $name
- * Optionally, specify the file name. If not set, the module's name is used.
+ * Optionally, specify the base file name (without the $type extension).
+ * If not set, $module is used.
*/
function module_load_include($type, $module, $name = NULL) {
if (empty($name)) {
@@ -356,19 +368,19 @@
* Allow modules to interact with the Drupal core.
*
* Drupal's module system is based on the concept of "hooks". A hook is a PHP
- * function that is named foo_bar(), where "foo" is the name of the module (whose
- * filename is thus foo.module) and "bar" is the name of the hook. Each hook has
- * a defined set of parameters and a specified result type.
- *
- * To extend Drupal, a module need simply implement a hook. When Drupal wishes to
- * allow intervention from modules, it determines which modules implement a hook
- * and call that hook in all enabled modules that implement it.
+ * function that is named foo_bar(), where "foo" is the name of the module
+ * (whose filename is thus foo.module) and "bar" is the name of the hook. Each
+ * hook has a defined set of parameters and a specified result type.
+ *
+ * To extend Drupal, a module need simply implement a hook. When Drupal wishes
+ * to allow intervention from modules, it determines which modules implement a
+ * hook and calls that hook in all enabled modules that implement it.
*
* The available hooks to implement are explained here in the Hooks section of
* the developer documentation. The string "hook" is used as a placeholder for
- * the module name is the hook definitions. For example, if the module file is
- * called example.module, then hook_help() as implemented by that module would be
- * defined as example_help().
+ * the module name in the hook definitions. For example, if the module file is
+ * called example.module, then hook_help() as implemented by that module would
+ * be defined as example_help().
*/
/**
Modified: branches/drupal6/includes/path.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/path.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/includes/path.inc (original)
+++ branches/drupal6/includes/path.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: path.inc,v 1.19.2.1 2008/10/13 21:06:41 dries Exp $
+// $Id: path.inc,v 1.19.2.2 2009/12/16 17:35:11 goba Exp $
/**
* @file
@@ -231,7 +231,7 @@
* String containing a set of patterns separated by \n, \r or \r\n.
*
* @return
- * Boolean value: TRUE if the path matches a pattern, FALSE otherwise.
+ * 1 if there is a match, 0 if there is not a match.
*/
function drupal_match_path($path, $patterns) {
static $regexps;
Modified: branches/drupal6/includes/xmlrpcs.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/includes/xmlrpcs.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/includes/xmlrpcs.inc (original)
+++ branches/drupal6/includes/xmlrpcs.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: xmlrpcs.inc,v 1.24.2.1 2008/04/28 10:04:52 dries Exp $
+// $Id: xmlrpcs.inc,v 1.24.2.3 2009/12/07 11:36:28 goba Exp $
/**
* The main entry point for XML-RPC requests.
@@ -64,10 +64,13 @@
if ($xmlrpc_server->message->messagetype != 'methodCall') {
xmlrpc_server_error(-32600, t('Server error. Invalid XML-RPC. Request must be a methodCall.'));
}
+ if (!isset($xmlrpc_server->message->params)) {
+ $xmlrpc_server->message->params = array();
+ }
xmlrpc_server_set($xmlrpc_server);
$result = xmlrpc_server_call($xmlrpc_server, $xmlrpc_server->message->methodname, $xmlrpc_server->message->params);
- if ($result->is_error) {
+ if (is_object($result) && !empty($result->is_error)) {
xmlrpc_server_error($result);
}
// Encode the result
Modified: branches/drupal6/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/aggregator/aggregator.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/aggregator/aggregator.info (original)
+++ branches/drupal6/modules/aggregator/aggregator.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/block/block.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/block/block.info (original)
+++ branches/drupal6/modules/block/block.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/block/block.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/block/block.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/block/block.module (original)
+++ branches/drupal6/modules/block/block.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: block.module,v 1.299.2.3 2008/06/24 14:40:08 goba Exp $
+// $Id: block.module,v 1.299.2.4 2009/10/06 12:13:01 goba Exp $
/**
* @file
@@ -298,6 +298,19 @@
return $blocks;
}
+/**
+ * Returns information from database about a user-created (custom) block.
+ *
+ * @param $bid
+ * ID of the block to get information for.
+ * @return
+ * Associative array of information stored in the database for this block.
+ * Array keys:
+ * - bid: Block ID.
+ * - info: Block description.
+ * - body: Block contents.
+ * - format: Filter ID of the filter format for the body.
+ */
function block_box_get($bid) {
return db_fetch_array(db_query("SELECT * FROM {boxes} WHERE bid = %d", $bid));
}
@@ -336,6 +349,19 @@
return $form;
}
+/**
+ * Saves a user-created block in the database.
+ *
+ * @param $edit
+ * Associative array of fields to save. Array keys:
+ * - info: Block description.
+ * - body: Block contents.
+ * - format: Filter ID of the filter format for the body.
+ * @param $delta
+ * Block ID of the block to save.
+ * @return
+ * Always returns TRUE.
+ */
function block_box_save($edit, $delta) {
if (!filter_access($edit['format'])) {
$edit['format'] = FILTER_FORMAT_DEFAULT;
Modified: branches/drupal6/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/blog/blog.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/blog/blog.info (original)
+++ branches/drupal6/modules/blog/blog.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/blogapi/blogapi.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/blogapi/blogapi.info (original)
+++ branches/drupal6/modules/blogapi/blogapi.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/book/book.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/book/book.info (original)
+++ branches/drupal6/modules/book/book.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/color/color.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/color/color.info (original)
+++ branches/drupal6/modules/color/color.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/comment/comment.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/comment/comment.info (original)
+++ branches/drupal6/modules/comment/comment.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/contact/contact.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/contact/contact.admin.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/contact/contact.admin.inc (original)
+++ branches/drupal6/modules/contact/contact.admin.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: contact.admin.inc,v 1.3 2007/11/09 07:55:13 dries Exp $
+// $Id: contact.admin.inc,v 1.3.2.1 2009/12/16 20:47:10 goba Exp $
/**
* @file
@@ -13,7 +13,7 @@
$result = db_query('SELECT cid, category, recipients, selected FROM {contact} ORDER BY weight, category');
$rows = array();
while ($category = db_fetch_object($result)) {
- $rows[] = array($category->category, $category->recipients, ($category->selected ? t('Yes') : t('No')), l(t('edit'), 'admin/build/contact/edit/'. $category->cid), l(t('delete'), 'admin/build/contact/delete/'. $category->cid));
+ $rows[] = array(check_plain($category->category), check_plain($category->recipients), ($category->selected ? t('Yes') : t('No')), l(t('edit'), 'admin/build/contact/edit/'. $category->cid), l(t('delete'), 'admin/build/contact/delete/'. $category->cid));
}
$header = array(t('Category'), t('Recipients'), t('Selected'), array('data' => t('Operations'), 'colspan' => 2));
Modified: branches/drupal6/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/contact/contact.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/contact/contact.info (original)
+++ branches/drupal6/modules/contact/contact.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/contact/contact.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/contact/contact.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/contact/contact.module (original)
+++ branches/drupal6/modules/contact/contact.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: contact.module,v 1.103.2.1 2008/04/09 21:11:46 goba Exp $
+// $Id: contact.module,v 1.103.2.2 2009/11/06 07:36:34 goba Exp $
/**
* @file
@@ -110,19 +110,39 @@
}
/**
- * Determine if a user can access to the contact tab.
+ * Menu access callback for a user's personal contact form.
+ *
+ * @param $account
+ * A user account object.
+ * @return
+ * TRUE if the current user has access to the requested user's contact form,
+ * or FALSE otherwise.
*/
function _contact_user_tab_access($account) {
global $user;
- if (!isset($account->contact)) {
- $account->contact = FALSE;
- }
- return
- $account && $user->uid &&
- (
- ($user->uid != $account->uid && $account->contact) ||
- user_access('administer users')
- );
+
+ // Anonymous users cannot use or have contact forms.
+ if (!$user->uid || !$account->uid) {
+ return FALSE;
+ }
+
+ // User administrators should always have access to personal contact forms.
+ if (user_access('administer users')) {
+ return TRUE;
+ }
+
+ // Users may not contact themselves.
+ if ($user->uid == $account->uid) {
+ return FALSE;
+ }
+
+ // If the requested user has disabled their contact form, or this preference
+ // has not yet been saved, do not allow users to contact them.
+ if (empty($account->contact)) {
+ return FALSE;
+ }
+
+ return TRUE;
}
/**
Modified: branches/drupal6/modules/dblog/dblog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/dblog/dblog.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/dblog/dblog.info (original)
+++ branches/drupal6/modules/dblog/dblog.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/filter/filter.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/filter/filter.info (original)
+++ branches/drupal6/modules/filter/filter.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/forum/forum.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/forum/forum.info (original)
+++ branches/drupal6/modules/forum/forum.info Mon Jan 11 20:46:47 2010
@@ -7,8 +7,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/help/help.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/help/help.info (original)
+++ branches/drupal6/modules/help/help.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/locale/locale.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/locale/locale.info (original)
+++ branches/drupal6/modules/locale/locale.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/menu/menu.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/menu/menu.admin.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/menu/menu.admin.inc (original)
+++ branches/drupal6/modules/menu/menu.admin.inc Mon Jan 11 20:46:47 2010
@@ -1,9 +1,9 @@
<?php
-// $Id: menu.admin.inc,v 1.26.2.4 2009/02/25 13:15:40 goba Exp $
+// $Id: menu.admin.inc,v 1.26.2.6 2009/12/16 20:47:10 goba Exp $
/**
* @file
- * Administrative page callbaks for menu module.
+ * Administrative page callbacks for menu module.
*/
/**
@@ -15,6 +15,7 @@
while ($menu = db_fetch_array($result)) {
$menu['href'] = 'admin/build/menu-customize/'. $menu['menu_name'];
$menu['localized_options'] = array();
+ $menu['description'] = filter_xss_admin($menu['description']);
$content[] = $menu;
}
return theme('admin_block_content', $content);
Modified: branches/drupal6/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/menu/menu.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/menu/menu.info (original)
+++ branches/drupal6/modules/menu/menu.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/node/node.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/node/node.info (original)
+++ branches/drupal6/modules/node/node.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/node/node.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/node/node.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/node/node.module (original)
+++ branches/drupal6/modules/node/node.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: node.module,v 1.947.2.18 2009/09/16 18:21:06 goba Exp $
+// $Id: node.module,v 1.947.2.19 2009/09/23 09:09:30 goba Exp $
/**
* @file
@@ -2320,7 +2320,7 @@
else {
// Try to allocate enough time to rebuild node grants
if (function_exists('set_time_limit')) {
- @set_time_limit($time_limit);
+ @set_time_limit(240);
}
$result = db_query("SELECT nid FROM {node}");
while ($node = db_fetch_object($result)) {
Modified: branches/drupal6/modules/openid/openid.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/openid/openid.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/openid/openid.inc (original)
+++ branches/drupal6/modules/openid/openid.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: openid.inc,v 1.8.2.1 2009/09/16 17:58:24 goba Exp $
+// $Id: openid.inc,v 1.8.2.2 2009/12/16 17:54:55 goba Exp $
/**
* @file
@@ -75,7 +75,7 @@
*/
function _openid_is_xri($identifier) {
// Strip the xri:// scheme from the identifier if present.
- if (stripos($identifier, 'xri://') !== FALSE) {
+ if (strpos(strtolower($identifier), 'xri://') !== FALSE) {
$identifier = substr($identifier, 6);
}
Modified: branches/drupal6/modules/openid/openid.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/openid/openid.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/openid/openid.info (original)
+++ branches/drupal6/modules/openid/openid.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/openid/openid.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/openid/openid.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/openid/openid.module (original)
+++ branches/drupal6/modules/openid/openid.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: openid.module,v 1.19.2.8 2009/09/16 19:34:14 goba Exp $
+// $Id: openid.module,v 1.19.2.9 2009/12/07 12:52:22 goba Exp $
/**
* @file
@@ -125,6 +125,12 @@
$form['pass']['#value'] = user_password();
}
$form['auth_openid'] = array('#type' => 'hidden', '#value' => $_SESSION['openid']['values']['auth_openid']);
+ $form['openid_display'] = array(
+ '#type' => 'item',
+ '#title' => t('Your OpenID'),
+ '#description' => t('This OpenID will be attached to your account after registration.'),
+ '#value' => check_plain($_SESSION['openid']['values']['auth_openid']),
+ );
}
return $form;
}
@@ -394,19 +400,34 @@
elseif (variable_get('user_register', 1)) {
// Register new user
$form_state['redirect'] = NULL;
- $form_state['values']['name'] = (empty($response['openid.sreg.nickname'])) ? $identity : $response['openid.sreg.nickname'];
+ $form_state['values']['name'] = (empty($response['openid.sreg.nickname'])) ? '' : $response['openid.sreg.nickname'];
$form_state['values']['mail'] = (empty($response['openid.sreg.email'])) ? '' : $response['openid.sreg.email'];
$form_state['values']['pass'] = user_password();
$form_state['values']['status'] = variable_get('user_register', 1) == 1;
$form_state['values']['response'] = $response;
$form_state['values']['auth_openid'] = $identity;
- $form = drupal_retrieve_form('user_register', $form_state);
- drupal_prepare_form('user_register', $form, $form_state);
- drupal_validate_form('user_register', $form, $form_state);
- if (form_get_errors()) {
+
+ if (empty($response['openid.sreg.email']) && empty($response['openid.sreg.nickname'])) {
+ drupal_set_message(t('Please complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), 'warning');
+ $success = FALSE;
+ }
+ else {
+ $form = drupal_retrieve_form('user_register', $form_state);
+ drupal_prepare_form('user_register', $form, $form_state);
+ drupal_validate_form('user_register', $form, $form_state);
+ $success = !form_get_errors();
+ if (!$success) {
+ drupal_set_message(t('Account registration using the information provided by your OpenID provider failed due to the reasons listed below. Please complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), 'warning');
+ // Append form validation errors below the above warning.
+ $messages = drupal_get_messages('error');
+ foreach ($messages['error'] as $message) {
+ drupal_set_message( $message, 'error');
+ }
+ }
+ }
+ if (!$success) {
// We were unable to register a valid new user, redirect to standard
// user/register and prefill with the values we received.
- drupal_set_message(t('OpenID registration failed for the reasons listed. You may register now, or if you already have an account you can <a href="@login">log in</a> now and add your OpenID under "My Account"', array('@login' => url('user/login'))), 'error');
$_SESSION['openid']['values'] = $form_state['values'];
// We'll want to redirect back to the same place.
$destination = drupal_get_destination();
Modified: branches/drupal6/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/path/path.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/path/path.info (original)
+++ branches/drupal6/modules/path/path.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/php/php.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/php/php.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/php/php.info (original)
+++ branches/drupal6/modules/php/php.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/ping/ping.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/ping/ping.info (original)
+++ branches/drupal6/modules/ping/ping.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/ping/ping.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/ping/ping.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/ping/ping.module (original)
+++ branches/drupal6/modules/ping/ping.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: ping.module,v 1.52 2007/12/19 17:45:42 goba Exp $
+// $Id: ping.module,v 1.52.2.1 2009/11/06 07:46:22 goba Exp $
/**
* @file
@@ -28,7 +28,9 @@
global $base_url;
if (variable_get('site_name', 0)) {
- if (db_result(db_query("SELECT COUNT(*) FROM {node} WHERE status = 1 AND (created > '". variable_get('cron_last', time()) ."' OR changed > '". variable_get('cron_last', time()) ."')"))) {
+ $cron_last = variable_get('cron_last', time());
+ // Query changed first since usually changed >= created.
+ if (db_result(db_query('SELECT COUNT(*) FROM {node} WHERE status = 1 AND changed > %d', $cron_last)) || db_result(db_query('SELECT COUNT(*) FROM {node} WHERE status = 1 AND created > %d', $cron_last))) {
_ping_notify(variable_get('site_name', ''), $base_url);
}
}
Modified: branches/drupal6/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/poll/poll.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/poll/poll.info (original)
+++ branches/drupal6/modules/poll/poll.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/profile/profile.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/profile/profile.info (original)
+++ branches/drupal6/modules/profile/profile.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/search/search.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/search/search.info (original)
+++ branches/drupal6/modules/search/search.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/search/search.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/search/search.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/search/search.module (original)
+++ branches/drupal6/modules/search/search.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: search.module,v 1.250.2.7 2009/09/14 14:55:09 goba Exp $
+// $Id: search.module,v 1.250.2.8 2009/12/07 15:44:33 goba Exp $
/**
* @file
@@ -1072,7 +1072,6 @@
);
$form['submit'] = array('#type' => 'submit', '#value' => t('Search'));
$form['#submit'][] = 'search_box_form_submit';
- $form['#validate'][] = 'search_box_form_validate';
return $form;
}
Modified: branches/drupal6/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/statistics/statistics.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/statistics/statistics.info (original)
+++ branches/drupal6/modules/statistics/statistics.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/syslog/syslog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/syslog/syslog.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/syslog/syslog.info (original)
+++ branches/drupal6/modules/syslog/syslog.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/system/system.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/system/system.info (original)
+++ branches/drupal6/modules/system/system.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/system/system.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/system/system.install?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/system/system.install (original)
+++ branches/drupal6/modules/system/system.install Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: system.install,v 1.238.2.18 2009/09/14 13:59:58 goba Exp $
+// $Id: system.install,v 1.238.2.19 2009/11/06 08:39:46 goba Exp $
/**
* Test and report Drupal installation requirements.
@@ -357,6 +357,11 @@
foreach ($modules as $module) {
drupal_install_schema($module);
}
+
+ // Clear out module list and hook implementation statics before calling
+ // system_theme_data().
+ module_list(TRUE, FALSE);
+ module_implements('', FALSE, TRUE);
// Load system theme data appropriately.
system_theme_data();
Modified: branches/drupal6/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/system/system.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/system/system.module (original)
+++ branches/drupal6/modules/system/system.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: system.module,v 1.585.2.44 2009/09/16 19:34:14 goba Exp $
+// $Id: system.module,v 1.585.2.47 2009/12/16 20:47:10 goba Exp $
/**
* @file
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.14');
+define('VERSION', '6.15');
/**
* Core API compatibility.
@@ -643,7 +643,7 @@
}
// Prepare for sorting as in function _menu_tree_check_access().
// The weight is offset so it is always positive, with a uniform 5-digits.
- $content[(50000 + $item['weight']) .' '. $item['title'] .' '. $item['mlid']] = $item;
+ $content[(50000 + $item['weight']) .' '. drupal_strtolower($item['title']) .' '. $item['mlid']] = $item;
}
ksort($content);
return $content;
Modified: branches/drupal6/modules/taxonomy/taxonomy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/taxonomy/taxonomy.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/taxonomy/taxonomy.info (original)
+++ branches/drupal6/modules/taxonomy/taxonomy.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/throttle/throttle.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/throttle/throttle.info (original)
+++ branches/drupal6/modules/throttle/throttle.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/tracker/tracker.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/tracker/tracker.info (original)
+++ branches/drupal6/modules/tracker/tracker.info Mon Jan 11 20:46:47 2010
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/translation/translation.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/translation/translation.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/translation/translation.info (original)
+++ branches/drupal6/modules/translation/translation.info Mon Jan 11 20:46:47 2010
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/trigger/trigger.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/trigger/trigger.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/trigger/trigger.info (original)
+++ branches/drupal6/modules/trigger/trigger.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/update/update.compare.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/update/update.compare.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/update/update.compare.inc (original)
+++ branches/drupal6/modules/update/update.compare.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: update.compare.inc,v 1.8.2.5 2009/06/09 11:08:32 goba Exp $
+// $Id: update.compare.inc,v 1.8.2.7 2009/11/06 07:26:21 goba Exp $
/**
* @file
@@ -52,7 +52,22 @@
*/
function _update_process_info_list(&$projects, $list, $project_type) {
foreach ($list as $file) {
- if (empty($file->status)) {
+ // A disabled base theme of an enabled sub-theme still has all of its code
+ // run by the sub-theme, so we include it in our "enabled" projects list.
+ if (!$file->status && !empty($file->sub_themes)) {
+ foreach ($file->sub_themes as $key => $name) {
+ // Build a list of enabled sub-themes.
+ if ($list[$key]->status) {
+ $file->enabled_sub_themes[$key] = $name;
+ }
+ }
+ // If there are no enabled subthemes, we should ingore this theme and go
+ // on to the next one.
+ if (empty($file->enabled_sub_themes)) {
+ continue;
+ }
+ }
+ elseif (empty($file->status)) {
// Skip disabled modules or themes.
continue;
}
@@ -84,21 +99,45 @@
$file->info['_info_file_ctime'] = filectime($info_filename);
}
+ if (!isset($file->info['datestamp'])) {
+ $file->info['datestamp'] = 0;
+ }
+
$project_name = $file->info['project'];
+
+ // Add a list of sub-themes that "depend on" the project and a list of base
+ // themes that are "required by" the project.
+ if ($project_name == 'drupal') {
+ // Drupal core is always required, so this extra info would be noise.
+ $sub_themes = array();
+ $base_themes = array();
+ }
+ else {
+ // Add list of enabled sub-themes.
+ $sub_themes = !empty($file->enabled_sub_themes) ? $file->enabled_sub_themes : array();
+ // Add list of base themes.
+ $base_themes = !empty($file->base_themes) ? $file->base_themes : array();
+ }
+
if (!isset($projects[$project_name])) {
// Only process this if we haven't done this project, since a single
// project can have multiple modules or themes.
$projects[$project_name] = array(
'name' => $project_name,
'info' => $file->info,
- 'datestamp' => isset($file->info['datestamp']) ? $file->info['datestamp'] : 0,
+ 'datestamp' => $file->info['datestamp'],
'includes' => array($file->name => $file->info['name']),
'project_type' => $project_name == 'drupal' ? 'core' : $project_type,
+ 'sub_themes' => $sub_themes,
+ 'base_themes' => $base_themes,
);
}
else {
$projects[$project_name]['includes'][$file->name] = $file->info['name'];
$projects[$project_name]['info']['_info_file_ctime'] = max($projects[$project_name]['info']['_info_file_ctime'], $file->info['_info_file_ctime']);
+ $projects[$project_name]['datestamp'] = max($projects[$project_name]['datestamp'], $file->info['datestamp']);
+ $projects[$project_name]['sub_themes'] = array_merge($projects[$project_name]['sub_themes'], $sub_themes);
+ $projects[$project_name]['base_themes'] = array_merge($projects[$project_name]['base_themes'], $base_themes);
}
}
}
Modified: branches/drupal6/modules/update/update.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/update/update.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/update/update.info (original)
+++ branches/drupal6/modules/update/update.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/update/update.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/update/update.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/update/update.module (original)
+++ branches/drupal6/modules/update/update.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: update.module,v 1.17.2.5 2009/06/09 11:08:32 goba Exp $
+// $Id: update.module,v 1.17.2.6 2009/12/16 17:30:00 goba Exp $
/**
* @file
@@ -557,7 +557,7 @@
}
}
-/**
+/**
* Retrieve data from the private update status cache table.
*
* @param $cid
@@ -585,7 +585,7 @@
*/
function _update_cache_clear($cid = NULL) {
if (empty($cid)) {
- db_query("DELETE FROM {cache_update}");
+ db_query("TRUNCATE TABLE {cache_update}");
}
else {
db_query("DELETE FROM {cache_update} WHERE cid = '%s'", $cid);
Modified: branches/drupal6/modules/update/update.report.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/update/update.report.inc?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/update/update.report.inc (original)
+++ branches/drupal6/modules/update/update.report.inc Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: update.report.inc,v 1.10.2.4 2009/06/09 11:08:32 goba Exp $
+// $Id: update.report.inc,v 1.10.2.6 2009/11/06 07:26:21 goba Exp $
/**
* @file
@@ -183,12 +183,33 @@
$row .= t('Includes: %includes', array('%includes' => implode(', ', $project['includes'])));
$row .= "</div>\n";
+ if (!empty($project['base_themes'])) {
+ $row .= '<div class="basethemes">';
+ sort($project['base_themes']);
+ // We use !dependencies and manually call theme('placeholder') here to
+ // avoid breakding the D6 string freeze. This identical string is
+ // already in modules/system/system.admin.inc.
+ $row .= t('Depends on: !dependencies', array('!dependencies' => theme('placeholder', implode(', ', $project['base_themes']))));
+ $row .= "</div>\n";
+ }
+
+ if (!empty($project['sub_themes'])) {
+ $row .= '<div class="subthemes">';
+ sort($project['sub_themes']);
+ // We use !required and manually call theme('placeholder') here to avoid
+ // breakding the D6 string freeze. This identical string is already in
+ // modules/system/system.admin.inc.
+ $row .= t('Required by: !required', array('!required' => theme('placeholder', implode(', ', $project['sub_themes']))));
+ $row .= "</div>\n";
+ }
+
$row .= "</div>\n"; // info div.
if (!isset($rows[$project['project_type']])) {
$rows[$project['project_type']] = array();
}
- $rows[$project['project_type']][] = array(
+ $row_key = isset($project['title']) ? drupal_strtolower($project['title']) : drupal_strtolower($project['name']);
+ $rows[$project['project_type']][$row_key] = array(
'class' => $class,
'data' => array($row),
);
@@ -203,6 +224,7 @@
);
foreach ($project_types as $type_name => $type_label) {
if (!empty($rows[$type_name])) {
+ ksort($rows[$type_name]);
$output .= "\n<h3>". $type_label ."</h3>\n";
$output .= theme('table', $header, $rows[$type_name], array('class' => 'update'));
}
Modified: branches/drupal6/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/upload/upload.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/upload/upload.info (original)
+++ branches/drupal6/modules/upload/upload.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/user/user-profile.tpl.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/user/user-profile.tpl.php?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/user/user-profile.tpl.php (original)
+++ branches/drupal6/modules/user/user-profile.tpl.php Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: user-profile.tpl.php,v 1.2.2.1 2008/10/15 13:52:04 dries Exp $
+// $Id: user-profile.tpl.php,v 1.2.2.2 2009/10/06 11:50:06 goba Exp $
/**
* @file user-profile.tpl.php
@@ -25,21 +25,19 @@
* markup for the group.
*
* To check for all available data within $profile, use the code below.
- *
* @code
* print '<pre>'. check_plain(print_r($profile, 1)) .'</pre>';
* @endcode
- *
- * @see user-profile-category.tpl.php
- * Where the html is handled for the group.
- * @see user-profile-field.tpl.php
- * Where the html is handled for each item in the group.
*
* Available variables:
* - $user_profile: All user profile data. Ready for print.
* - $profile: Keyed array of profile categories and their items or other data
* provided by modules.
*
+ * @see user-profile-category.tpl.php
+ * Where the html is handled for the group.
+ * @see user-profile-item.tpl.php
+ * Where the html is handled for each item in the group.
* @see template_preprocess_user_profile()
*/
?>
Modified: branches/drupal6/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/user/user.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/user/user.info (original)
+++ branches/drupal6/modules/user/user.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/modules/user/user.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/modules/user/user.module?rev=2099&op=diff
==============================================================================
--- branches/drupal6/modules/user/user.module (original)
+++ branches/drupal6/modules/user/user.module Mon Jan 11 20:46:47 2010
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.892.2.18 2009/09/16 17:54:19 goba Exp $
+// $Id: user.module,v 1.892.2.19 2009/11/06 07:36:34 goba Exp $
/**
* @file
@@ -1117,12 +1117,30 @@
return $items;
}
+/**
+ * Implementation of hook_init().
+ */
function user_init() {
drupal_add_css(drupal_get_path('module', 'user') .'/user.css', 'module');
}
-function user_uid_optional_load($arg) {
- return user_load(isset($arg) ? $arg : $GLOBALS['user']->uid);
+/**
+ * Load either a specified or the current user account.
+ *
+ * @param $uid
+ * An optional user ID of the user to load. If not provided, the current
+ * user's ID will be used.
+ * @return
+ * A fully-loaded $user object upon successful user load, FALSE if user
+ * cannot be loaded.
+ *
+ * @see user_load()
+ */
+function user_uid_optional_load($uid = NULL) {
+ if (!isset($uid)) {
+ $uid = $GLOBALS['user']->uid;
+ }
+ return user_load($uid);
}
/**
Modified: branches/drupal6/themes/bluemarine/bluemarine.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/bluemarine/bluemarine.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/themes/bluemarine/bluemarine.info (original)
+++ branches/drupal6/themes/bluemarine/bluemarine.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/themes/chameleon/chameleon.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/chameleon/chameleon.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/themes/chameleon/chameleon.info (original)
+++ branches/drupal6/themes/chameleon/chameleon.info Mon Jan 11 20:46:47 2010
@@ -12,8 +12,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/themes/chameleon/marvin/marvin.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/chameleon/marvin/marvin.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/themes/chameleon/marvin/marvin.info (original)
+++ branches/drupal6/themes/chameleon/marvin/marvin.info Mon Jan 11 20:46:47 2010
@@ -7,8 +7,8 @@
core = 6.x
base theme = chameleon
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/themes/garland/garland.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/garland/garland.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/themes/garland/garland.info (original)
+++ branches/drupal6/themes/garland/garland.info Mon Jan 11 20:46:47 2010
@@ -7,8 +7,8 @@
stylesheets[all][] = style.css
stylesheets[print][] = print.css
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/themes/garland/minnelli/minnelli.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/garland/minnelli/minnelli.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/themes/garland/minnelli/minnelli.info (original)
+++ branches/drupal6/themes/garland/minnelli/minnelli.info Mon Jan 11 20:46:47 2010
@@ -6,8 +6,8 @@
base theme = garland
stylesheets[all][] = minnelli.css
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
Modified: branches/drupal6/themes/pushbutton/pushbutton.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/themes/pushbutton/pushbutton.info?rev=2099&op=diff
==============================================================================
--- branches/drupal6/themes/pushbutton/pushbutton.info (original)
+++ branches/drupal6/themes/pushbutton/pushbutton.info Mon Jan 11 20:46:47 2010
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2009-09-16
-version = "6.14"
+; Information added by drupal.org packaging script on 2009-12-16
+version = "6.15"
project = "drupal"
-datestamp = "1253130027"
+datestamp = "1260996916"
More information about the Pkg-drupal-commits
mailing list