',
+ 'aggregator_category_selector' => 'checkboxes',
+ 'aggregator_clear' => 9676800,
+ 'aggregator_summary_items' => 3,
+ 'feed_default_items' => 10,
+ 'feed_item_length' => 'teaser',
+ );
+}
+
+/**
* Implementation of hook_theme().
*/
function aggregator_theme() {
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.325
diff -u -p -r1.325 block.module
--- modules/block/block.module 5 Apr 2009 12:31:56 -0000 1.325
+++ modules/block/block.module 14 Apr 2009 09:32:40 -0000
@@ -88,6 +88,15 @@ function block_help($path, $arg) {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function block_variable_info() {
+ return array(
+ 'block_cache' => CACHE_DISABLED,
+ );
+}
+
+/**
* Implementation of hook_theme().
*/
function block_theme() {
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.147
diff -u -p -r1.147 blogapi.module
--- modules/blogapi/blogapi.module 1 Apr 2009 01:28:24 -0000 1.147
+++ modules/blogapi/blogapi.module 14 Apr 2009 09:32:40 -0000
@@ -21,6 +21,25 @@ function blogapi_help($path, $arg) {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function blogapi_variable_info() {
+ return array(
+ 'blogapi_node_types' => blogapi_node_types_default(),
+ );
+}
+
+/**
+ * Returns the default value for the node types listing.
+ */
+function blogapi_node_types_default() {
+ if (node_get_types('type', 'blog')) {
+ return array('blog' => 1);
+ }
+ return array();
+}
+
+/**
* Implementation of hook_perm().
*/
function blogapi_perm() {
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.489
diff -u -p -r1.489 book.module
--- modules/book/book.module 11 Apr 2009 22:19:44 -0000 1.489
+++ modules/book/book.module 14 Apr 2009 09:32:42 -0000
@@ -164,6 +164,17 @@ function book_menu() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function book_variable_info() {
+ return array(
+ 'book_allowed_types' => array('book'),
+ 'book_block_mode' => 'all pages',
+ 'book_child_type' => 'book',
+ );
+}
+
+/**
* Menu item access callback - determine if the outline tab is accessible.
*/
function _book_outline_access($node) {
Index: modules/color/color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.56
diff -u -p -r1.56 color.module
--- modules/color/color.module 18 Feb 2009 14:28:22 -0000 1.56
+++ modules/color/color.module 14 Apr 2009 09:32:42 -0000
@@ -28,6 +28,19 @@ function color_theme() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function color_variable_info() {
+ return array(
+ 'color_screenshot' => NULL,
+ 'color_stylesheets' => array(),
+ 'color_logo' => NULL,
+ 'color_palette' => array(),
+ 'color_files' => array(),
+ );
+}
+
+/**
* Implementation of hook_form_FORM_ID_alter().
*/
function color_form_system_theme_settings_alter(&$form, &$form_state) {
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.702
diff -u -p -r1.702 comment.module
--- modules/comment/comment.module 11 Apr 2009 22:19:44 -0000 1.702
+++ modules/comment/comment.module 14 Apr 2009 09:32:47 -0000
@@ -211,6 +211,22 @@ function comment_menu() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function comment_variable_info() {
+ return array(
+ 'comment_block_count' => 10,
+ 'node_cron_comments_scale' => 0,
+ 'comment_default_mode' => COMMENT_MODE_THREADED_EXPANDED,
+ 'comment_default_per_page' => 50,
+ 'comment_anonymous' => COMMENT_ANONYMOUS_MAYNOT_CONTACT,
+ 'comment_subject_field' => 1,
+ 'comment_preview' => COMMENT_PREVIEW_REQUIRED,
+ 'comment_form_location' => COMMENT_FORM_SEPARATE_PAGE,
+ );
+}
+
+/**
* Implementation of hook_node_type().
*/
function comment_node_type($op, $info) {
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.112
diff -u -p -r1.112 contact.module
--- modules/contact/contact.module 8 Mar 2009 05:08:22 -0000 1.112
+++ modules/contact/contact.module 14 Apr 2009 09:32:48 -0000
@@ -112,6 +112,17 @@ function contact_menu() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function contact_variable_info() {
+ return array(
+ 'contact_default_status' => 1,
+ 'contact_form_information' => t('You can leave a message using the contact form below.'),
+ 'contact_hourly_threshold' => 3,
+ );
+}
+
+/**
* Determine if a user can access to the contact tab.
*/
function _contact_user_tab_access($account) {
Index: modules/dblog/dblog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v
retrieving revision 1.37
diff -u -p -r1.37 dblog.module
--- modules/dblog/dblog.module 13 Apr 2009 08:48:58 -0000 1.37
+++ modules/dblog/dblog.module 14 Apr 2009 09:32:49 -0000
@@ -73,6 +73,15 @@ function dblog_menu() {
return $items;
}
+/**
+ * Implementation of hook_variable_info().
+ */
+function dblog_variable_info() {
+ return array(
+ 'dblog_row_limit' => 1000,
+ );
+}
+
function dblog_init() {
if (arg(0) == 'admin' && arg(1) == 'reports') {
// Add the CSS for this module
Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.7
diff -u -p -r1.7 field.module
--- modules/field/field.module 26 Mar 2009 13:31:24 -0000 1.7
+++ modules/field/field.module 14 Apr 2009 09:32:50 -0000
@@ -606,5 +606,13 @@ function template_preprocess_field(&$var
}
/**
+ * Implementation of hook_variable_info().
+ */
+function field_variable_info() {
+ return array(
+ 'field_storage_module' => 'field_sql_storage',
+ );
+}
+/**
* @} End of "defgroup field"
*/
\ No newline at end of file
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.247
diff -u -p -r1.247 filter.module
--- modules/filter/filter.module 13 Apr 2009 12:07:00 -0000 1.247
+++ modules/filter/filter.module 14 Apr 2009 09:32:54 -0000
@@ -133,6 +133,19 @@ function filter_menu() {
return $items;
}
+/**
+ * Implementation of hook_variable_info().
+ */
+function filter_variable_info() {
+ return array(
+ 'allowed_html' => ' -
-
- ',
+ 'filter_allowed_protocols' => array('ftp', 'http', 'https', 'irc', 'mailto', 'news', 'nntp', 'rtsp', 'sftp', 'ssh', 'telnet', 'webcal'),
+ 'filter_default_format' => 1,
+ 'filter_html_help' => 1,
+ 'filter_html_nofollow' => FALSE,
+ );
+}
+
function filter_format_load($arg) {
return filter_formats($arg);
}
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.489
diff -u -p -r1.489 forum.module
--- modules/forum/forum.module 17 Mar 2009 12:41:54 -0000 1.489
+++ modules/forum/forum.module 14 Apr 2009 09:33:04 -0000
@@ -33,6 +33,21 @@ function forum_help($path, $arg) {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function forum_variable_info() {
+ return array(
+ 'forum_block_num_active' => 5,
+ 'forum_block_num_new' => 5,
+ 'forum_containers' => array(),
+ 'forum_hot_topic' => 15,
+ 'forum_nav_vocabulary' => '',
+ 'forum_order' => 1,
+ 'forum_per_page' => 25,
+ );
+}
+
+/**
* Implementation of hook_theme().
*/
function forum_theme() {
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.238
diff -u -p -r1.238 locale.module
--- modules/locale/locale.module 31 Mar 2009 02:02:21 -0000 1.238
+++ modules/locale/locale.module 14 Apr 2009 09:33:05 -0000
@@ -173,6 +173,15 @@ function locale_menu() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function locale_variable_info() {
+ return array(
+ 'locale_cache_strings' => 1,
+ );
+}
+
+/**
* Wrapper function to be able to set callbacks in locale.inc
*/
function locale_inc_callback() {
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.184
diff -u -p -r1.184 menu.module
--- modules/menu/menu.module 11 Apr 2009 22:19:45 -0000 1.184
+++ modules/menu/menu.module 14 Apr 2009 09:33:06 -0000
@@ -152,6 +152,16 @@ function menu_theme() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function menu_variable_info() {
+ return array(
+ 'menu_default_node_menu' => 'main-menu',
+ 'menu_override_parent_selector' => FALSE,
+ );
+}
+
+/**
* Implementation of hook_enable().
*
* Add a link for each custom menu.
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1033
diff -u -p -r1.1033 node.module
--- modules/node/node.module 26 Mar 2009 13:31:25 -0000 1.1033
+++ modules/node/node.module 14 Apr 2009 09:33:16 -0000
@@ -145,6 +145,20 @@ function node_theme() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function node_variable_info() {
+ return array(
+ 'default_nodes_main' => 10,
+ 'node_access_needs_rebuild' => FALSE,
+ 'node_cron_last' => 0,
+ 'node_options' => array('status', 'promote'),
+ 'node_preview' => 0,
+ 'teaser_length' => 600,
+ );
+}
+
+/**
* Implementation of hook_cron().
*/
function node_cron() {
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.252
diff -u -p -r1.252 profile.module
--- modules/profile/profile.module 14 Mar 2009 23:01:37 -0000 1.252
+++ modules/profile/profile.module 14 Apr 2009 09:33:16 -0000
@@ -126,6 +126,15 @@ function profile_menu() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function profile_variable_info() {
+ return array(
+ 'profile_block_author_fields' => array(),
+ );
+}
+
+/**
* Implementation of hook_block_list().
*/
function profile_block_list() {
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.287
diff -u -p -r1.287 search.module
--- modules/search/search.module 27 Mar 2009 00:16:16 -0000 1.287
+++ modules/search/search.module 14 Apr 2009 09:33:16 -0000
@@ -138,6 +138,31 @@ function search_theme() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function search_variable_info() {
+ return array(
+ 'minimum_word_size' => 3,
+ 'overlap_cjk' => TRUE,
+ 'search_cron_limit' => 100,
+ 'search_tag_weights' => array(
+ 'h1' => 25,
+ 'h2' => 18,
+ 'h3' => 15,
+ 'h4' => 12,
+ 'h5' => 9,
+ 'h6' => 6,
+ 'u' => 3,
+ 'b' => 3,
+ 'i' => 3,
+ 'strong' => 3,
+ 'em' => 3,
+ 'a' => 10,
+ ),
+ );
+}
+
+/**
* Implementation of hook_perm().
*/
function search_perm() {
Index: modules/simpletest/simpletest.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.module,v
retrieving revision 1.39
diff -u -p -r1.39 simpletest.module
--- modules/simpletest/simpletest.module 31 Mar 2009 01:49:53 -0000 1.39
+++ modules/simpletest/simpletest.module 14 Apr 2009 09:33:18 -0000
@@ -43,6 +43,16 @@ function simpletest_perm() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function simpletest_variable_info() {
+ return array(
+ 'simpletest_httpauth_pass' => '',
+ 'simpletest_httpauth_username' => '',
+ );
+}
+
+/**
* Implementation of hook_theme().
*/
function simpletest_theme() {
Index: modules/simpletest/tests/bootstrap.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/bootstrap.test,v
retrieving revision 1.14
diff -u -p -r1.14 bootstrap.test
--- modules/simpletest/tests/bootstrap.test 2 Apr 2009 20:39:44 -0000 1.14
+++ modules/simpletest/tests/bootstrap.test 14 Apr 2009 09:33:19 -0000
@@ -151,23 +151,31 @@ class BootstrapVariableTestCase extends
}
/**
- * testVariable
+ * Test the variable system.
*/
function testVariable() {
+ // Retrieving default values for variables.
+ $default_cache = './includes/cache.inc'; // The default anonymous variable from System module.
+ $cache = variable_get('cache_inc');
+ $this->assertIdentical($cache, $default_cache, t('Retrieving default values for variables'));
+
+ // Retrieving default values for variables held in a hook_variable_info() implementation.
+ $name = variable_get('site_name');
+ $this->assertIdentical('Drupal', $name, t('Retrieving default values for variables held in hook_variable_info().'));
+
// Setting and retrieving values.
$variable = $this->randomName();
variable_set('simpletest_bootstrap_variable_test', $variable);
$this->assertIdentical($variable, variable_get('simpletest_bootstrap_variable_test'), t('Setting and retrieving values'));
// Make sure the variable persists across multiple requests.
- $this->drupalGet('system-test/variable-get');
- $this->assertText($variable, t('Variable persists across multiple requests'));
+ $retrieved_variable = $this->drupalGet('system-test/variable-get');
+ $this->assertIdentical($retrieved_variable, $variable, t('Variable persists across multiple requests'));
// Deleting variables.
- $default_value = $this->randomName();
variable_del('simpletest_bootstrap_variable_test');
- $variable = variable_get('simpletest_bootstrap_variable_test', $default_value);
- $this->assertIdentical($variable, $default_value, t('Deleting variables'));
+ $variable = variable_get('simpletest_bootstrap_variable_test');
+ $this->assertIdentical($variable, NULL, t('Deleting variables'));
}
/**
Index: modules/simpletest/tests/common.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v
retrieving revision 1.32
diff -u -p -r1.32 common.test
--- modules/simpletest/tests/common.test 31 Mar 2009 01:49:53 -0000 1.32
+++ modules/simpletest/tests/common.test 14 Apr 2009 09:33:22 -0000
@@ -647,21 +647,21 @@ class DrupalErrorHandlerUnitTest extends
'%type' => 'Notice',
'%message' => 'Undefined variable: bananas',
'%function' => 'system_test_generate_warnings()',
- '%line' => 184,
+ '%line' => 191,
'%file' => realpath('modules/simpletest/tests/system_test.module'),
);
$error_warning = array(
'%type' => 'Warning',
'%message' => 'Division by zero',
'%function' => 'system_test_generate_warnings()',
- '%line' => 186,
+ '%line' => 193,
'%file' => realpath('modules/simpletest/tests/system_test.module'),
);
$error_user_notice = array(
'%type' => 'User notice',
'%message' => 'Drupal is awesome',
'%function' => 'system_test_generate_warnings()',
- '%line' => 188,
+ '%line' => 195,
'%file' => realpath('modules/simpletest/tests/system_test.module'),
);
@@ -695,14 +695,14 @@ class DrupalErrorHandlerUnitTest extends
'%type' => 'Exception',
'%message' => 'Drupal is awesome',
'%function' => 'system_test_trigger_exception()',
- '%line' => 197,
+ '%line' => 204,
'%file' => realpath('modules/simpletest/tests/system_test.module'),
);
$error_pdo_exception = array(
'%type' => 'PDOException',
'%message' => 'SQLSTATE',
'%function' => 'system_test_trigger_pdo_exception()',
- '%line' => 205,
+ '%line' => 212,
'%file' => realpath('modules/simpletest/tests/system_test.module'),
);
Index: modules/simpletest/tests/system_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/system_test.module,v
retrieving revision 1.8
diff -u -p -r1.8 system_test.module
--- modules/simpletest/tests/system_test.module 9 Dec 2008 11:09:26 -0000 1.8
+++ modules/simpletest/tests/system_test.module 14 Apr 2009 09:33:23 -0000
@@ -42,8 +42,7 @@ function system_test_menu() {
$items['system-test/variable-get'] = array(
'title' => 'Variable Get',
- 'page callback' => 'variable_get',
- 'page arguments' => array('simpletest_bootstrap_variable_test', NULL),
+ 'page callback' => 'simpletest_bootstrap_variable_test',
'access arguments' => array('access content'),
'type' => MENU_CALLBACK,
);
@@ -86,6 +85,14 @@ function system_test_basic_auth_page() {
return $output;
}
+/**
+ * Menu callback; SimpleTest bootstrap variable test.
+ */
+function simpletest_bootstrap_variable_test() {
+ echo variable_get('simpletest_bootstrap_variable_test');
+ exit;
+}
+
function system_test_redirect($code) {
$code = (int)$code;
if ($code != 200) {
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.300
diff -u -p -r1.300 statistics.module
--- modules/statistics/statistics.module 13 Apr 2009 10:40:13 -0000 1.300
+++ modules/statistics/statistics.module 14 Apr 2009 09:33:24 -0000
@@ -101,6 +101,22 @@ function statistics_perm() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function statistics_variable_info() {
+ return array (
+ 'node_cron_views_scale' => 0,
+ 'statistics_block_top_all_num' => 0,
+ 'statistics_block_top_day_num' => 0,
+ 'statistics_block_top_last_num' => 0,
+ 'statistics_count_content_views' => 0,
+ 'statistics_day_timestamp' => '',
+ 'statistics_enable_access_log' => 0,
+ 'statistics_flush_accesslog_timer' => 259200,
+ );
+}
+
+/**
* Implementation of hook_node_view().
*/
function statistics_node_view($node, $teaser, $page) {
Index: modules/syslog/syslog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/syslog/syslog.module,v
retrieving revision 1.22
diff -u -p -r1.22 syslog.module
--- modules/syslog/syslog.module 13 Apr 2009 08:49:01 -0000 1.22
+++ modules/syslog/syslog.module 14 Apr 2009 09:33:25 -0000
@@ -27,6 +27,15 @@ function syslog_help($path, $arg) {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function syslog_variable_info() {
+ return array(
+ 'syslog_facility' => DEFAULT_SYSLOG_FACILITY,
+ );
+}
+
+/**
* Implementation of hook_form_FORM_ID_alter().
*/
function syslog_form_system_logging_settings_alter(&$form, &$form_state) {
Index: modules/system/system.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v
retrieving revision 1.25
diff -u -p -r1.25 system.api.php
--- modules/system/system.api.php 29 Mar 2009 23:11:09 -0000 1.25
+++ modules/system/system.api.php 14 Apr 2009 09:33:32 -0000
@@ -1685,5 +1685,32 @@ function hook_disable() {
}
/**
+ * The construction of any default variables associated with the given module.
+ *
+ * @return
+ * An associative array, where the keys are the names of the variables, and
+ * the values are the default values to be used if not overridden by the
+ * administrator.
+ */
+function hook_variable_info() {
+ return array(
+ 'upload_max_resolution' => 0,
+ 'upload_list_default' => 1,
+ 'upload_extensions' => 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp',
+ 'upload_uploadsize' => 1,
+ 'upload_usersize' => 1,
+ 'upload' => 1,
+ );
+}
+
+/**
+ * Allows alteration of the default variables created in hook_variable_info().
+ */
+function hook_variable_info_alter(&$variables) {
+ $variables['upload_max_resolution'] = 1024;
+ $variables['upload_usersize'] = 0;
+}
+
+/**
* @} End of "addtogroup hooks".
*/
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.678
diff -u -p -r1.678 system.module
--- modules/system/system.module 13 Apr 2009 18:50:43 -0000 1.678
+++ modules/system/system.module 14 Apr 2009 09:33:39 -0000
@@ -115,6 +115,437 @@ function system_help($path, $arg) {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function system_variable_info() {
+ return array(
+ 'actions_max_stack' => 35,
+ 'admin_compact_mode' => FALSE,
+ 'admin_theme' => 0,
+ 'allow_insecure_uploads' => 0,
+ 'anonymous' => 'Anonymous',
+ 'cache_flush' => 0,
+ 'cache_lifetime' => 0,
+ 'clean_url' => '0',
+ 'configurable_timezones' => 1,
+ 'cron_key' => 'drupal',
+ 'cron_last' => NULL,
+ 'cron_semaphore' => FALSE,
+ 'cron_threshold_error' => 1209600,
+ 'cron_threshold_warning' => 172800,
+ 'css_js_query_string' => '0',
+ 'date_default_timezone' => 'UTC',
+ 'date_first_day' => 0,
+ 'date_format_long' => 'l, F j, Y - H:i',
+ 'date_format_long_custom' => '',
+ 'date_format_medium' => 'D, m/d/Y - H:i',
+ 'date_format_medium_custom' => '',
+ 'date_format_short' => 'm/d/Y - H:i',
+ 'date_format_short_custom' => '',
+ 'drupal_badge_color' => 'powered-blue',
+ 'drupal_badge_size' => '80x15',
+ 'drupal_http_request_fails' => FALSE,
+ 'drupal_private_key' => '',
+ 'error_level' => 1,
+ 'file_directory_path' => conf_path() . '/files',
+ 'file_directory_temp' => NULL,
+ 'file_downloads' => FILE_DOWNLOADS_PUBLIC,
+ 'forum_block_num_0' => NULL,
+ 'forum_block_num_1' => NULL,
+ 'image_jpeg_quality' => 75,
+ 'image_toolkit' => 'gd',
+ 'install_locale_batch_components' => array(),
+ 'install_profile' => 'default',
+ 'install_profile_modules' => array(),
+ 'install_time' => 0,
+ 'javascript_parsed' => array(),
+ 'language_negotiation' => LANGUAGE_NEGOTIATION_NONE,
+ 'locale_custom_strings' => array(),
+ 'locale_js_directory' => 'languages',
+ 'maintenance_theme' => 'minnelli',
+ 'menu_expanded' => array(),
+ 'menu_main_menu_source' => 'main-menu',
+ 'menu_masks' => array(),
+ 'menu_parent_items' => 0,
+ 'menu_primary_menu' => 0,
+ 'menu_rebuild_needed' => FALSE,
+ 'menu_secondary_menu' => 0,
+ 'menu_secondary_menu_source' => 'secondary-menu',
+ 'mime_extension_mapping' => drupal_mime_extension_mapping_defaults(),
+ 'node_admin_theme' => 0,
+ 'page_compression' => TRUE,
+ 'preprocess_css' => FALSE,
+ 'preprocess_js' => FALSE,
+ 'site_403' => '',
+ 'site_404' => '',
+ 'site_footer' => '',
+ 'site_mail' => FALSE,
+ 'site_mission' => '',
+ 'site_name' => 'Drupal',
+ 'site_offline' => 0,
+ 'site_offline_message' => '@site is currently under maintenance. We should be back shortly. Thank you for your patience.',
+ 'site_slogan' => '',
+ 'smtp_library' => '',
+ 'system_update_6043_RC2' => FALSE,
+ 'theme_default' => 'garland',
+ 'theme_settings' => array(),
+ 'update_d6_requirements' => FALSE,
+ 'upload_extensions_default' => 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp',
+ );
+}
+
+function drupal_mime_extension_mapping_defaults() {
+ return array(
+ 'ez' => 'application/andrew-inset',
+ 'atom' => 'application/atom',
+ 'atomcat' => 'application/atomcat+xml',
+ 'atomsrv' => 'application/atomserv+xml',
+ 'cap|pcap' => 'application/cap',
+ 'cu' => 'application/cu-seeme',
+ 'tsp' => 'application/dsptype',
+ 'spl' => 'application/x-futuresplash',
+ 'hta' => 'application/hta',
+ 'jar' => 'application/java-archive',
+ 'ser' => 'application/java-serialized-object',
+ 'class' => 'application/java-vm',
+ 'hqx' => 'application/mac-binhex40',
+ 'cpt' => 'image/x-corelphotopaint',
+ 'nb' => 'application/mathematica',
+ 'mdb' => 'application/msaccess',
+ 'doc|dot' => 'application/msword',
+ 'bin' => 'application/octet-stream',
+ 'oda' => 'application/oda',
+ 'ogg|ogx' => 'application/ogg',
+ 'pdf' => 'application/pdf',
+ 'key' => 'application/pgp-keys',
+ 'pgp' => 'application/pgp-signature',
+ 'prf' => 'application/pics-rules',
+ 'ps|ai|eps' => 'application/postscript',
+ 'rar' => 'application/rar',
+ 'rdf' => 'application/rdf+xml',
+ 'rss' => 'application/rss+xml',
+ 'rtf' => 'application/rtf',
+ 'smi|smil' => 'application/smil',
+ 'wpd' => 'application/wordperfect',
+ 'wp5' => 'application/wordperfect5.1',
+ 'xhtml|xht' => 'application/xhtml+xml',
+ 'xml|xsl' => 'application/xml',
+ 'zip' => 'application/zip',
+ 'cdy' => 'application/vnd.cinderella',
+ 'kml' => 'application/vnd.google-earth.kml+xml',
+ 'kmz' => 'application/vnd.google-earth.kmz',
+ 'xul' => 'application/vnd.mozilla.xul+xml',
+ 'xls|xlb|xlt' => 'application/vnd.ms-excel',
+ 'cat' => 'application/vnd.ms-pki.seccat',
+ 'stl' => 'application/vnd.ms-pki.stl',
+ 'ppt|pps' => 'application/vnd.ms-powerpoint',
+ 'odc' => 'application/vnd.oasis.opendocument.chart',
+ 'odb' => 'application/vnd.oasis.opendocument.database',
+ 'odf' => 'application/vnd.oasis.opendocument.formula',
+ 'odg' => 'application/vnd.oasis.opendocument.graphics',
+ 'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+ 'odi' => 'application/vnd.oasis.opendocument.image',
+ 'odp' => 'application/vnd.oasis.opendocument.presentation',
+ 'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+ 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+ 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+ 'odt' => 'application/vnd.oasis.opendocument.text',
+ 'odm' => 'application/vnd.oasis.opendocument.text-master',
+ 'ott' => 'application/vnd.oasis.opendocument.text-template',
+ 'oth' => 'application/vnd.oasis.opendocument.text-web',
+ 'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
+ 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
+ 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+ 'potm' => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
+ 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+ 'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+ 'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
+ 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+ 'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+ 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+ 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+ 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+ 'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+ 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ 'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
+ 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+ 'cod' => 'application/vnd.rim.cod',
+ 'mmf' => 'application/vnd.smaf',
+ 'sdc' => 'application/vnd.stardivision.calc',
+ 'sds' => 'application/vnd.stardivision.chart',
+ 'sda' => 'application/vnd.stardivision.draw',
+ 'sdd' => 'application/vnd.stardivision.impress',
+ 'sdf' => 'application/vnd.stardivision.math',
+ 'sdw' => 'application/vnd.stardivision.writer',
+ 'sgl' => 'application/vnd.stardivision.writer-global',
+ 'sxc' => 'application/vnd.sun.xml.calc',
+ 'stc' => 'application/vnd.sun.xml.calc.template',
+ 'sxd' => 'application/vnd.sun.xml.draw',
+ 'std' => 'application/vnd.sun.xml.draw.template',
+ 'sxi' => 'application/vnd.sun.xml.impress',
+ 'sti' => 'application/vnd.sun.xml.impress.template',
+ 'sxm' => 'application/vnd.sun.xml.math',
+ 'sxw' => 'application/vnd.sun.xml.writer',
+ 'sxg' => 'application/vnd.sun.xml.writer.global',
+ 'stw' => 'application/vnd.sun.xml.writer.template',
+ 'sis' => 'application/vnd.symbian.install',
+ 'vsd' => 'application/vnd.visio',
+ 'wbxml' => 'application/vnd.wap.wbxml',
+ 'wmlc' => 'application/vnd.wap.wmlc',
+ 'wmlsc' => 'application/vnd.wap.wmlscriptc',
+ 'wk' => 'application/x-123',
+ '7z' => 'application/x-7z-compressed',
+ 'abw' => 'application/x-abiword',
+ 'dmg' => 'application/x-apple-diskimage',
+ 'bcpio' => 'application/x-bcpio',
+ 'torrent' => 'application/x-bittorrent',
+ 'cab' => 'application/x-cab',
+ 'cbr' => 'application/x-cbr',
+ 'cbz' => 'application/x-cbz',
+ 'cdf' => 'application/x-cdf',
+ 'vcd' => 'application/x-cdlink',
+ 'pgn' => 'application/x-chess-pgn',
+ 'cpio' => 'application/x-cpio',
+ 'csh' => 'text/x-csh',
+ 'deb|udeb' => 'application/x-debian-package',
+ 'dcr|dir|dxr' => 'application/x-director',
+ 'dms' => 'application/x-dms',
+ 'wad' => 'application/x-doom',
+ 'dvi' => 'application/x-dvi',
+ 'rhtml' => 'application/x-httpd-eruby',
+ 'flac' => 'application/x-flac',
+ 'pfa|pfb|gsf|pcf|pcf.Z' => 'application/x-font',
+ 'mm' => 'application/x-freemind',
+ 'gnumeric' => 'application/x-gnumeric',
+ 'sgf' => 'application/x-go-sgf',
+ 'gcf' => 'application/x-graphing-calculator',
+ 'gtar|tgz|taz' => 'application/x-gtar',
+ 'hdf' => 'application/x-hdf',
+ 'phtml|pht|php' => 'application/x-httpd-php',
+ 'phps' => 'application/x-httpd-php-source',
+ 'php3' => 'application/x-httpd-php3',
+ 'php3p' => 'application/x-httpd-php3-preprocessed',
+ 'php4' => 'application/x-httpd-php4',
+ 'ica' => 'application/x-ica',
+ 'ins|isp' => 'application/x-internet-signup',
+ 'iii' => 'application/x-iphone',
+ 'iso' => 'application/x-iso9660-image',
+ 'jnlp' => 'application/x-java-jnlp-file',
+ 'js' => 'application/x-javascript',
+ 'jmz' => 'application/x-jmol',
+ 'chrt' => 'application/x-kchart',
+ 'kil' => 'application/x-killustrator',
+ 'skp|skd|skt|skm' => 'application/x-koan',
+ 'kpr|kpt' => 'application/x-kpresenter',
+ 'ksp' => 'application/x-kspread',
+ 'kwd|kwt' => 'application/x-kword',
+ 'latex' => 'application/x-latex',
+ 'lha' => 'application/x-lha',
+ 'lyx' => 'application/x-lyx',
+ 'lzh' => 'application/x-lzh',
+ 'lzx' => 'application/x-lzx',
+ 'frm|maker|frame|fm|fb|book|fbdoc' => 'application/x-maker',
+ 'mif' => 'application/x-mif',
+ 'wmd' => 'application/x-ms-wmd',
+ 'wmz' => 'application/x-ms-wmz',
+ 'com|exe|bat|dll' => 'application/x-msdos-program',
+ 'msi' => 'application/x-msi',
+ 'nc' => 'application/x-netcdf',
+ 'pac' => 'application/x-ns-proxy-autoconfig',
+ 'nwc' => 'application/x-nwc',
+ 'o' => 'application/x-object',
+ 'oza' => 'application/x-oz-application',
+ 'p7r' => 'application/x-pkcs7-certreqresp',
+ 'crl' => 'application/x-pkcs7-crl',
+ 'pyc|pyo' => 'application/x-python-code',
+ 'qtl' => 'application/x-quicktimeplayer',
+ 'rpm' => 'application/x-redhat-package-manager',
+ 'sh' => 'text/x-sh',
+ 'shar' => 'application/x-shar',
+ 'swf|swfl' => 'application/x-shockwave-flash',
+ 'sit|sitx' => 'application/x-stuffit',
+ 'sv4cpio' => 'application/x-sv4cpio',
+ 'sv4crc' => 'application/x-sv4crc',
+ 'tar' => 'application/x-tar',
+ 'tcl' => 'application/x-tcl',
+ 'gf' => 'application/x-tex-gf',
+ 'pk' => 'application/x-tex-pk',
+ 'texinfo|texi' => 'application/x-texinfo',
+ '~|%|bak|old|sik' => 'application/x-trash',
+ 't|tr|roff' => 'application/x-troff',
+ 'man' => 'application/x-troff-man',
+ 'me' => 'application/x-troff-me',
+ 'ms' => 'application/x-troff-ms',
+ 'ustar' => 'application/x-ustar',
+ 'src' => 'application/x-wais-source',
+ 'wz' => 'application/x-wingz',
+ 'crt' => 'application/x-x509-ca-cert',
+ 'xcf' => 'application/x-xcf',
+ 'fig' => 'application/x-xfig',
+ 'xpi' => 'application/x-xpinstall',
+ 'au|snd' => 'audio/basic',
+ 'mid|midi|kar' => 'audio/midi',
+ 'mpga|mpega|mp2|mp3|m4a' => 'audio/mpeg',
+ 'm3u' => 'audio/x-mpegurl',
+ 'oga|spx' => 'audio/ogg',
+ 'sid' => 'audio/prs.sid',
+ 'aif|aiff|aifc' => 'audio/x-aiff',
+ 'gsm' => 'audio/x-gsm',
+ 'wma' => 'audio/x-ms-wma',
+ 'wax' => 'audio/x-ms-wax',
+ 'ra|rm|ram' => 'audio/x-pn-realaudio',
+ 'ra' => 'audio/x-realaudio',
+ 'pls' => 'audio/x-scpls',
+ 'sd2' => 'audio/x-sd2',
+ 'wav' => 'audio/x-wav',
+ 'alc' => 'chemical/x-alchemy',
+ 'cac|cache' => 'chemical/x-cache',
+ 'csf' => 'chemical/x-cache-csf',
+ 'cbin|cascii|ctab' => 'chemical/x-cactvs-binary',
+ 'cdx' => 'chemical/x-cdx',
+ 'cer' => 'chemical/x-cerius',
+ 'c3d' => 'chemical/x-chem3d',
+ 'chm' => 'chemical/x-chemdraw',
+ 'cif' => 'chemical/x-cif',
+ 'cmdf' => 'chemical/x-cmdf',
+ 'cml' => 'chemical/x-cml',
+ 'cpa' => 'chemical/x-compass',
+ 'bsd' => 'chemical/x-crossfire',
+ 'csml|csm' => 'chemical/x-csml',
+ 'ctx' => 'chemical/x-ctx',
+ 'cxf|cef' => 'chemical/x-cxf',
+ 'emb|embl' => 'chemical/x-embl-dl-nucleotide',
+ 'spc' => 'chemical/x-galactic-spc',
+ 'inp|gam|gamin' => 'chemical/x-gamess-input',
+ 'fch|fchk' => 'chemical/x-gaussian-checkpoint',
+ 'cub' => 'chemical/x-gaussian-cube',
+ 'gau|gjc|gjf' => 'chemical/x-gaussian-input',
+ 'gal' => 'chemical/x-gaussian-log',
+ 'gcg' => 'chemical/x-gcg8-sequence',
+ 'gen' => 'chemical/x-genbank',
+ 'hin' => 'chemical/x-hin',
+ 'istr|ist' => 'chemical/x-isostar',
+ 'jdx|dx' => 'chemical/x-jcamp-dx',
+ 'kin' => 'chemical/x-kinemage',
+ 'mcm' => 'chemical/x-macmolecule',
+ 'mmd|mmod' => 'chemical/x-macromodel-input',
+ 'mol' => 'chemical/x-mdl-molfile',
+ 'rd' => 'chemical/x-mdl-rdfile',
+ 'rxn' => 'chemical/x-mdl-rxnfile',
+ 'sd|sdf' => 'chemical/x-mdl-sdfile',
+ 'tgf' => 'chemical/x-mdl-tgf',
+ 'mcif' => 'chemical/x-mmcif',
+ 'mol2' => 'chemical/x-mol2',
+ 'b' => 'chemical/x-molconn-Z',
+ 'gpt' => 'chemical/x-mopac-graph',
+ 'mop|mopcrt|mpc|dat|zmt' => 'chemical/x-mopac-input',
+ 'moo' => 'chemical/x-mopac-out',
+ 'mvb' => 'chemical/x-mopac-vib',
+ 'asn' => 'chemical/x-ncbi-asn1-spec',
+ 'prt|ent' => 'chemical/x-ncbi-asn1-ascii',
+ 'val|aso' => 'chemical/x-ncbi-asn1-binary',
+ 'pdb|ent' => 'chemical/x-pdb',
+ 'ros' => 'chemical/x-rosdal',
+ 'sw' => 'chemical/x-swissprot',
+ 'vms' => 'chemical/x-vamas-iso14976',
+ 'vmd' => 'chemical/x-vmd',
+ 'xtel' => 'chemical/x-xtel',
+ 'xyz' => 'chemical/x-xyz',
+ 'gif' => 'image/gif',
+ 'ief' => 'image/ief',
+ 'jpeg|jpg|jpe' => 'image/jpeg',
+ 'pcx' => 'image/pcx',
+ 'png' => 'image/png',
+ 'svg|svgz' => 'image/svg+xml',
+ 'tiff|tif' => 'image/tiff',
+ 'djvu|djv' => 'image/vnd.djvu',
+ 'wbmp' => 'image/vnd.wap.wbmp',
+ 'ras' => 'image/x-cmu-raster',
+ 'cdr' => 'image/x-coreldraw',
+ 'pat' => 'image/x-coreldrawpattern',
+ 'cdt' => 'image/x-coreldrawtemplate',
+ 'ico' => 'image/x-icon',
+ 'art' => 'image/x-jg',
+ 'jng' => 'image/x-jng',
+ 'bmp' => 'image/x-ms-bmp',
+ 'psd' => 'image/x-photoshop',
+ 'pnm' => 'image/x-portable-anymap',
+ 'pbm' => 'image/x-portable-bitmap',
+ 'pgm' => 'image/x-portable-graymap',
+ 'ppm' => 'image/x-portable-pixmap',
+ 'rgb' => 'image/x-rgb',
+ 'xbm' => 'image/x-xbitmap',
+ 'xpm' => 'image/x-xpixmap',
+ 'xwd' => 'image/x-xwindowdump',
+ 'eml' => 'message/rfc822',
+ 'igs|iges' => 'model/iges',
+ 'msh|mesh|silo' => 'model/mesh',
+ 'wrl|vrml' => 'model/vrml',
+ 'ics|icz' => 'text/calendar',
+ 'css' => 'text/css',
+ 'csv' => 'text/csv',
+ '323' => 'text/h323',
+ 'html|htm|shtml' => 'text/html',
+ 'uls' => 'text/iuls',
+ 'mml' => 'text/mathml',
+ 'asc|txt|text|pot' => 'text/plain',
+ 'rtx' => 'text/richtext',
+ 'sct|wsc' => 'text/scriptlet',
+ 'tm|ts' => 'text/texmacs',
+ 'tsv' => 'text/tab-separated-values',
+ 'jad' => 'text/vnd.sun.j2me.app-descriptor',
+ 'wml' => 'text/vnd.wap.wml',
+ 'wmls' => 'text/vnd.wap.wmlscript',
+ 'bib' => 'text/x-bibtex',
+ 'boo' => 'text/x-boo',
+ 'h++|hpp|hxx|hh' => 'text/x-c++hdr',
+ 'c++|cpp|cxx|cc' => 'text/x-c++src',
+ 'h' => 'text/x-chdr',
+ 'htc' => 'text/x-component',
+ 'c' => 'text/x-csrc',
+ 'd' => 'text/x-dsrc',
+ 'diff|patch' => 'text/x-diff',
+ 'hs' => 'text/x-haskell',
+ 'java' => 'text/x-java',
+ 'lhs' => 'text/x-literate-haskell',
+ 'moc' => 'text/x-moc',
+ 'p|pas' => 'text/x-pascal',
+ 'gcd' => 'text/x-pcs-gcd',
+ 'pl|pm' => 'text/x-perl',
+ 'py' => 'text/x-python',
+ 'etx' => 'text/x-setext',
+ 'tcl|tk' => 'text/x-tcl',
+ 'tex|ltx|sty|cls' => 'text/x-tex',
+ 'vcs' => 'text/x-vcalendar',
+ 'vcf' => 'text/x-vcard',
+ '3gp' => 'video/3gpp',
+ 'dl' => 'video/dl',
+ 'dif|dv' => 'video/dv',
+ 'fli' => 'video/fli',
+ 'gl' => 'video/gl',
+ 'mpeg|mpg|mpe' => 'video/mpeg',
+ 'mp4' => 'video/mp4',
+ 'ogv' => 'video/ogg',
+ 'qt|mov' => 'video/quicktime',
+ 'mxu' => 'video/vnd.mpegurl',
+ 'lsf|lsx' => 'video/x-la-asf',
+ 'mng' => 'video/x-mng',
+ 'asf|asx' => 'video/x-ms-asf',
+ 'wm' => 'video/x-ms-wm',
+ 'wmv' => 'video/x-ms-wmv',
+ 'wmx' => 'video/x-ms-wmx',
+ 'wvx' => 'video/x-ms-wvx',
+ 'avi' => 'video/x-msvideo',
+ 'movie' => 'video/x-sgi-movie',
+ 'ice' => 'x-conference/x-cooltalk',
+ 'sisx' => 'x-epoc/x-sisx-app',
+ 'vrm|vrml|wrl' => 'x-world/x-vrml',
+ 'xps' => 'application/vnd.ms-xpsdocument',
+ );
+}
+
+/**
* Implementation of hook_theme().
*/
function system_theme() {
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.40
diff -u -p -r1.40 system.test
--- modules/system/system.test 31 Mar 2009 01:49:54 -0000 1.40
+++ modules/system/system.test 14 Apr 2009 09:33:44 -0000
@@ -788,7 +788,7 @@ class SystemSettingsForm extends DrupalW
function testAutomaticDefaults() {
$form = array();
- $form['system_settings_form_test'] = array(
+ $form['system_settings_form_test_1'] = array(
'#type' => 'checkbox',
'#default_value' => FALSE,
);
@@ -814,14 +814,15 @@ class SystemSettingsForm extends DrupalW
);
$automatic = system_settings_form($form, FALSE);
- $this->assertFalse($automatic['system_settings_form_test']['#default_value']);
+ $this->assertFalse($automatic['system_settings_form_test_1']['#default_value']);
$this->assertFalse($automatic['system_settings_form_test_2']['#default_value']);
$this->assertTrue($automatic['system_settings_form_test_3']['#default_value']);
$this->assertFalse($automatic['has_children']['system_settings_form_test_4']['#default_value']);
$this->assertTrue($automatic['has_children']['system_settings_form_test_5']['#default_value']);
$no_automatic = system_settings_form($form);
- $this->assertTrue($no_automatic['system_settings_form_test']['#default_value']);
+ $this->fail(print_r($no_automatic, true));
+ $this->assertTrue($no_automatic['system_settings_form_test_1']['#default_value']);
$this->assertFalse($no_automatic['system_settings_form_test_2']['#default_value']);
$this->assertTrue($no_automatic['system_settings_form_test_3']['#default_value']);
$this->assertTrue($no_automatic['has_children']['system_settings_form_test_4']['#default_value']);
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.466
diff -u -p -r1.466 taxonomy.module
--- modules/taxonomy/taxonomy.module 13 Apr 2009 18:52:38 -0000 1.466
+++ modules/taxonomy/taxonomy.module 14 Apr 2009 09:33:46 -0000
@@ -187,6 +187,15 @@ function taxonomy_menu() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function taxonomy_variable_info() {
+ return array(
+ 'taxonomy_override_selector' => FALSE,
+ );
+}
+
+/**
* Return the vocabulary name given the vocabulary object.
*/
function taxonomy_admin_vocabulary_title_callback($vocabulary) {
Index: modules/update/update.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.module,v
retrieving revision 1.30
diff -u -p -r1.30 update.module
--- modules/update/update.module 22 Jan 2009 03:11:54 -0000 1.30
+++ modules/update/update.module 14 Apr 2009 09:33:48 -0000
@@ -142,6 +142,19 @@ function update_menu() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function update_variable_info() {
+ return array(
+ 'update_check_frequency' => 1,
+ 'update_fetch_url' => UPDATE_DEFAULT_URL,
+ 'update_last_check' => 0,
+ 'update_notify_emails' => array(),
+ 'update_notification_threshold' => 'all',
+ );
+}
+
+/**
* Implementation of the hook_theme() registry.
*/
function update_theme() {
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.232
diff -u -p -r1.232 upload.module
--- modules/upload/upload.module 11 Apr 2009 22:19:45 -0000 1.232
+++ modules/upload/upload.module 14 Apr 2009 09:33:54 -0000
@@ -105,6 +105,20 @@ function upload_menu() {
}
/**
+ * Implementation of hook_variable_info().
+ */
+function upload_variable_info() {
+ return array(
+ 'upload' => 1,
+ 'upload_extensions' => 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp',
+ 'upload_list_default' => 1,
+ 'upload_max_resolution' => 0,
+ 'upload_uploadsize' => 1,
+ 'upload_usersize' => 1,
+ );
+}
+
+/**
* Determine the limitations on files that a given user may upload. The user
* may be in multiple roles so we select the most permissive limitations from
* all of their roles.
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.974
diff -u -p -r1.974 user.module
--- modules/user/user.module 13 Apr 2009 12:14:57 -0000 1.974
+++ modules/user/user.module 14 Apr 2009 09:33:59 -0000
@@ -18,6 +18,23 @@ define('EMAIL_MAX_LENGTH', 64);
/**
+ * The standard log2 number of iterations for password stretching. This should
+ * increase by 1 at least every other Drupal version in order to counteract
+ * increases in the speed and power of computers available to crack the hashes.
+ */
+define('DRUPAL_HASH_COUNT', 14);
+
+/**
+ * The minimum allowed log2 number of iterations for password stretching.
+ */
+define('DRUPAL_MIN_HASH_COUNT', 7);
+
+/**
+ * The maximum allowed log2 number of iterations for password stretching.
+ */
+define('DRUPAL_MAX_HASH_COUNT', 30);
+
+/**
* Invokes hook_user() in every module.
*
* We cannot use module_invoke() for this, because the arguments need to
@@ -109,6 +126,34 @@ function user_field_build_modes($obj_typ
return $modes;
}
+/**
+ * Implementation of hook_variable_info().
+ */
+function user_variable_info() {
+ return array(
+ 'password_count_log2' => DRUPAL_HASH_COUNT,
+ 'user_block_max_list_count' => 10,
+ 'user_block_seconds_online' => 900,
+ 'user_block_whois_new_count' => 5,
+ // Use user_mail_notify_status as a fallback for an unknown $op, which will
+ // default to TRUE; however, we don't want mail notifications on by default
+ // with deletions and blockings.
+ 'user_mail_notify_status' => TRUE,
+ 'user_mail_notify_status_blocked' => FALSE,
+ 'user_mail_notify_status_deleted' => FALSE,
+ 'user_email_verification' => TRUE,
+ 'user_pictures' => 0,
+ 'user_picture_default' => '',
+ 'user_picture_dimensions' => '85x85',
+ 'user_picture_file_size' => 30,
+ 'user_picture_guidelines' => '',
+ 'user_picture_path' => 'pictures',
+ 'user_register' => 1,
+ 'user_registration_help' => '',
+ 'user_signatures' => 0,
+ );
+}
+
function user_external_load($authname) {
$uid = db_query("SELECT uid FROM {authmap} WHERE authname = :authname", array(':authname' => $authname))->fetchField();
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.33
diff -u -p -r1.33 user.test
--- modules/user/user.test 31 Mar 2009 01:49:55 -0000 1.33
+++ modules/user/user.test 14 Apr 2009 09:34:02 -0000
@@ -45,7 +45,7 @@ class UserRegistrationTestCase extends D
$this->assertEqual($user->status, variable_get('user_register', 1) == 1 ? 1 : 0, t('Correct status field.'));
$this->assertEqual($user->timezone, variable_get('date_default_timezone'), t('Correct time zone field.'));
$this->assertEqual($user->language, '', t('Correct language field.'));
- $this->assertEqual($user->picture, '', t('Correct picture field.'));
+ $this->assertEqual($user->picture, 0, t('Correct picture field.'));
$this->assertEqual($user->init, $mail, t('Correct init field.'));
// Attempt to login with incorrect password.