diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index eac2f97..98f043d 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -2172,13 +2172,16 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) { */ function drupal_get_user_timezone() { global $user; - if (variable_get('configurable_timezones', 1) && $user->uid && $user->timezone) { + $config = config('system.date'); + + if ($config->get('timezone.user.configurable') && $user->uid && $user->timezone) { return $user->timezone; } else { // Ignore PHP strict notice if time zone has not yet been set in the php.ini // configuration. - return variable_get('date_default_timezone', @date_default_timezone_get()); + $config_data_default_timezone = $config->get('timezone.default'); + return !empty($config_data_default_timezone) ? $config_data_default_timezone : @date_default_timezone_get(); } } diff --git a/core/includes/common.inc b/core/includes/common.inc index 4c86953..a88f1df 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -1899,7 +1899,7 @@ function format_interval($interval, $granularity = 2, $langcode = NULL) { * A UNIX timestamp to format. * @param $type * (optional) The format to use, one of: - * - One of the built-in formats: 'short', 'medium', 'long', 'html_datetime', + * - One of the built-in formats: 'system_short', 'system_medium', 'system_long', 'html_datetime', * 'html_date', 'html_time', 'html_yearless_date', 'html_week', * 'html_month', 'html_year'. * - The name of a date type defined by a module in hook_date_format_types(), @@ -1922,7 +1922,7 @@ function format_interval($interval, $granularity = 2, $langcode = NULL) { * @return * A translated date string in the requested format. */ -function format_date($timestamp, $type = 'medium', $format = '', $timezone = NULL, $langcode = NULL) { +function format_date($timestamp, $type = 'system_medium', $format = '', $timezone = NULL, $langcode = NULL) { // Use the advanced drupal_static() pattern, since this is called very often. static $drupal_static_fast; if (!isset($drupal_static_fast)) { @@ -1943,58 +1943,15 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL $langcode = language(LANGUAGE_TYPE_INTERFACE)->langcode; } - switch ($type) { - case 'short': - $format = variable_get('date_format_short', 'm/d/Y - H:i'); - break; - - case 'long': - $format = variable_get('date_format_long', 'l, F j, Y - H:i'); - break; - - case 'html_datetime': - $format = variable_get('date_format_html_datetime', 'Y-m-d\TH:i:sO'); - break; - - case 'html_date': - $format = variable_get('date_format_html_date', 'Y-m-d'); - break; - - case 'html_time': - $format = variable_get('date_format_html_time', 'H:i:s'); - break; - - case 'html_yearless_date': - $format = variable_get('date_format_html_yearless_date', 'm-d'); - break; - - case 'html_week': - $format = variable_get('date_format_html_week', 'Y-\WW'); - break; - - case 'html_month': - $format = variable_get('date_format_html_month', 'Y-m'); - break; - - case 'html_year': - $format = variable_get('date_format_html_year', 'Y'); - break; - - case 'custom': - // No change to format. - break; - - case 'medium': - default: - // Retrieve the format of the custom $type passed. - if ($type != 'medium') { - $format = variable_get('date_format_' . $type, ''); - } - // Fall back to 'medium'. - if ($format === '') { - $format = variable_get('date_format_medium', 'D, m/d/Y - H:i'); - } - break; + // if we have an incoming custom date format use the provided date format pattern. + if ($type != 'custom') { + $format = config('system.date')->get('formats.' . $type . '.pattern'); + // Fall back too system_medium if a value was not found. + if (!isset($format)) { + $format = config('system.date')->get('formats.system_medium.pattern'); + } + // Use the appropriate server pattern. + $format = system_get_date_format_pattern($format); } // Create a DateTime object from the timestamp. diff --git a/core/includes/form.inc b/core/includes/form.inc index 6956f04..9a73342 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -2963,7 +2963,8 @@ function form_process_date($element) { $element['#tree'] = TRUE; // Determine the order of day, month, year in the site's chosen date format. - $format = variable_get('date_format_short', 'm/d/Y - H:i'); + $format = config('system.date')->get('formats.system_short.pattern'); + $format = system_get_date_format_pattern($format); $sort = array(); $sort['day'] = max(strpos($format, 'd'), strpos($format, 'j')); $sort['month'] = max(strpos($format, 'm'), strpos($format, 'M')); diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 3968682..3530864 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1933,7 +1933,7 @@ function _install_configure_form($form, &$form_state, &$install_state) { '#type' => 'select', '#title' => st('Default country'), '#empty_value' => '', - '#default_value' => variable_get('site_default_country', NULL), + '#default_value' => config('system.date')->get('country.default'), '#options' => $countries, '#description' => st('Select the default country for the site.'), '#weight' => 0, @@ -1999,8 +1999,10 @@ function install_configure_form_submit($form, &$form_state) { ->set('mail', $form_state['values']['site_mail']) ->save(); - variable_set('date_default_timezone', $form_state['values']['date_default_timezone']); - variable_set('site_default_country', $form_state['values']['site_default_country']); + config('system.date') + ->set('timezone.default', $form_state['values']['date_default_timezone']) + ->set('country.default', $form_state['values']['site_default_country']) + ->save(); // Enable update.module if this option was selected. if ($form_state['values']['update_status_module'][1]) { diff --git a/core/includes/menu.inc b/core/includes/menu.inc index c7fcd92..0f97cf4 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -1254,9 +1254,9 @@ function menu_tree_page_data($menu_name, $max_depth = NULL, $only_active_trail = } $parents = $active_trail; - $expanded = variable_get('menu_expanded', array()); + $expanded = state()->get('menu_expanded'); // Check whether the current menu has any links set to be expanded. - if (!$only_active_trail && in_array($menu_name, $expanded)) { + if (!$only_active_trail && $expanded && in_array($menu_name, $expanded)) { // Collect all the links set to be expanded, and then add all of // their children to the list as well. do { @@ -2264,10 +2264,11 @@ function theme_menu_local_tasks(&$variables) { * * @return * An array of menu machine names, in order of preference. The - * 'menu_default_active_menus' variable may be used to assert a menu order - * different from the order of creation, or to prevent a particular menu from - * being used at all in the active trail. - * E.g., $conf['menu_default_active_menus'] = array('tools', 'main') + * 'system.menu.active_menus_default' config item may be used to assert a menu + * order different from the order of creation, or to prevent a particular menu + * from being used at all in the active trail. + * E.g., $conf['system.menu']['active_menus_default'] = array('tools', + * 'main'). */ function menu_set_active_menu_names($menu_names = NULL) { $active = &drupal_static(__FUNCTION__); @@ -2276,7 +2277,8 @@ function menu_set_active_menu_names($menu_names = NULL) { $active = $menu_names; } elseif (!isset($active)) { - $active = variable_get('menu_default_active_menus', array_keys(menu_list_system_menus())); + $config = config('system.menu'); + $active = $config->get('active_menus_default') ?: array_keys(menu_list_system_menus()); } return $active; } @@ -3275,7 +3277,7 @@ function _menu_clear_page_cache() { */ function _menu_set_expanded_menus() { $names = db_query("SELECT menu_name FROM {menu_links} WHERE expanded <> 0 GROUP BY menu_name")->fetchCol(); - variable_set('menu_expanded', $names); + state()->set('menu_expanded', $names); } /** diff --git a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php index e88525e..ac48bc8 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php @@ -91,7 +91,7 @@ public function onJson(GetResponseForControllerResultEvent $event) { $page_callback_result = $event->getControllerResult(); $response = new JsonResponse(); - $response->setContent($page_callback_result); + $response->setData($page_callback_result); return $response; } diff --git a/core/modules/action/config/action.settings.yml b/core/modules/action/config/action.settings.yml new file mode 100644 index 0000000..b1d52fa --- /dev/null +++ b/core/modules/action/config/action.settings.yml @@ -0,0 +1 @@ +recursion_limit: '35' diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc index 78ca5bc..aacdbd2 100644 --- a/core/modules/aggregator/aggregator.pages.inc +++ b/core/modules/aggregator/aggregator.pages.inc @@ -335,7 +335,8 @@ function template_preprocess_aggregator_item(&$variables) { $variables['source_date'] = t('%ago ago', array('%ago' => format_interval(REQUEST_TIME - $item->timestamp))); } else { - $variables['source_date'] = format_date($item->timestamp, 'custom', variable_get('date_format_medium', 'D, m/d/Y - H:i')); + $format = config('system.date')->get('formats.system_medium.pattern'); + $variables['source_date'] = format_date($item->timestamp, 'custom', system_get_date_format_pattern($format)); } $variables['categories'] = array(); diff --git a/core/modules/ban/ban.admin.inc b/core/modules/ban/ban.admin.inc index bccd84e..0ea23fc 100644 --- a/core/modules/ban/ban.admin.inc +++ b/core/modules/ban/ban.admin.inc @@ -6,11 +6,14 @@ */ /** - * Page callback; Displays banned IP addresses. + * Page callback: Displays banned IP addresses. * * @param string $default_ip - * (optional) IP address to be passed on to drupal_get_form() for - * use as the default value of the IP address form field. + * (optional) IP address to be passed on to drupal_get_form() for use as the + * default value of the IP address form field. + * + * @return array + * A render array. */ function ban_admin_page($default_ip = '') { $rows = array(); @@ -53,7 +56,6 @@ function ban_admin_page($default_ip = '') { * * @see ban_ip_form_validate() * @see ban_ip_form_submit() - * * @ingroup forms */ function ban_ip_form($form, &$form_state, $default_ip) { @@ -119,7 +121,7 @@ function ban_ip_delete_form($form, &$form_state, array $ban_ip) { '#value' => $ban_ip, ); return confirm_form($form, - t('Are you sure you want to delete %ip?', array('%ip' => $ban_ip['ip'])), + t('Are you sure you want to unblock %ip?', array('%ip' => $ban_ip['ip'])), 'admin/config/people/ban', NULL, t('Delete') diff --git a/core/modules/ban/ban.module b/core/modules/ban/ban.module index d886871..12405ba 100644 --- a/core/modules/ban/ban.module +++ b/core/modules/ban/ban.module @@ -2,7 +2,7 @@ /** * @file - * Enables banning of IP addresses. + * Allows to ban individual IP addresses. */ /** @@ -13,7 +13,7 @@ function ban_help($path, $arg) { case 'admin/help#ban': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Ban module allows administrators to ban visits to their site from given IP addresses.') . '

'; + $output .= '

' . t('The Ban module allows administrators to ban visits to their site from individual IP addresses.') . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Banning IP addresses') . '
'; @@ -60,61 +60,6 @@ function ban_menu() { } /** - * Implements hook_boot(). - */ -function ban_boot() { - ban_block_denied(ip_address()); -} - -/** - * Returns whether an IP address is blocked. - * - * Blocked IP addresses are stored in the database by default. However, for - * performance reasons we allow an override in variables. - * - * @param string $ip - * The IP address to check. - * - * @return bool - * TRUE if access is denied, FALSE if access is allowed. - */ -function ban_is_denied($ip) { - $denied = FALSE; - // Because this function is called on every page request, we first check - // for an array of IP addresses in settings.php before querying the - // database. - $blocked_ips = variable_get('ban_ips'); - if (isset($blocked_ips) && is_array($blocked_ips)) { - $denied = in_array($ip, $blocked_ips); - } - // If $conf['page_cache_without_database'] = TRUE; is set in settings.php, - // then the database is not available yet, so IPs recorded in the database - // won't be denied. However, the user asked explicitly not to use the - // database, and in this case it's also quite likely that the user relies - // on higher performance solutions like a firewall. - elseif (class_exists('Drupal\Core\Database\Database', FALSE) && function_exists('db_query')) { - $denied = (bool) db_query("SELECT 1 FROM {ban_ip} WHERE ip = :ip", array(':ip' => $ip))->fetchField(); - } - return $denied; -} - -/** - * Prints a message and exits if access from a given IP address is denied. - * - * @param string $ip - * The IP address to check. - */ -function ban_block_denied($ip) { - // Check whether the given IP address has been blocked. - if (ban_is_denied($ip)) { - header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden'); - // t() is not yet available. - print 'Sorry, ' . check_plain($ip) . ' has been banned.'; - exit(); - } -} - -/** * Loads a banned IP address record from the database. * * @param int $iid diff --git a/core/modules/ban/lib/Drupal/ban/BanBundle.php b/core/modules/ban/lib/Drupal/ban/BanBundle.php new file mode 100644 index 0000000..563332c --- /dev/null +++ b/core/modules/ban/lib/Drupal/ban/BanBundle.php @@ -0,0 +1,31 @@ +register('ban.ip_manager', 'Drupal\ban\BanIpManager') + ->addArgument(new Reference('database')); + $container->register('ban.subscriber', 'Drupal\ban\EventSubscriber\BanSubscriber') + ->addArgument(new Reference('ban.ip_manager')) + ->addTag('event_subscriber'); + } +} diff --git a/core/modules/ban/lib/Drupal/ban/BanIpManager.php b/core/modules/ban/lib/Drupal/ban/BanIpManager.php new file mode 100644 index 0000000..8ee2e0d --- /dev/null +++ b/core/modules/ban/lib/Drupal/ban/BanIpManager.php @@ -0,0 +1,49 @@ +connection = $connection; + } + + /** + * Returns whether an IP address is blocked. + * + * @param string $ip + * The IP address to check. + * + * @return bool + * TRUE if access is denied, FALSE if access is allowed. + */ + public function isDenied($ip) { + $denied = $this->connection + ->query('SELECT 1 FROM {ban_ip} WHERE ip = :ip', array(':ip' => $ip)) + ->fetchField(); + return (bool) $denied; + } +} diff --git a/core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php b/core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php new file mode 100644 index 0000000..7dc141c --- /dev/null +++ b/core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php @@ -0,0 +1,65 @@ +manager = $manager; + } + + /** + * Response with 403 if the visitor's IP adress is banned. + * + * @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event + * The Event to process. + */ + public function onKernelRequestBannedIpCheck(GetResponseEvent $event) { + // @todo convert this to Request::getClientIP(). + $ip = ip_address(); + if ($this->manager->isDenied($ip)) { + $response = new Response('Sorry, ' . check_plain($ip) . ' has been banned.', 403); + $event->setResponse($response); + } + } + + /** + * Registers the methods in this class that should be listeners. + * + * @return array + * An array of event listener definitions. + */ + static function getSubscribedEvents() { + $events[KernelEvents::REQUEST][] = array('onKernelRequestBannedIpCheck', 40); + return $events; + } + +} diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php index 9c085bb..584ac00 100644 --- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php +++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php @@ -197,7 +197,6 @@ public function submitOptionsForm(&$form, &$form_state) { break; case 'block_caching': $this->setOption('block_caching', $form_state['values']['block_caching']); - $this->saveBlockCache($form_state['view']->storage->get('name') . '-'. $form_state['display_id'], $form_state['values']['block_caching']); break; } } @@ -216,7 +215,7 @@ public function usesExposed() { * Update the block delta when you change the machine readable name of the display. */ protected function updateBlockBid($name, $old_delta, $delta) { - $old_hashes = $hashes = variable_get('views_block_hashes', array()); + $old_hashes = $hashes = state()->get('views_block_hashes'); $old_delta = $name . '-' . $old_delta; $delta = $name . '-' . $delta; @@ -240,27 +239,7 @@ protected function updateBlockBid($name, $old_delta, $delta) { // Update the hashes if needed. if ($hashes != $old_hashes) { - variable_set('views_block_hashes', $hashes); - } - } - - /** - * Save the block cache setting in the blocks table if this block allready - * exists in the blocks table. Dirty fix untill http://drupal.org/node/235673 gets in. - */ - protected function saveBlockCache($delta, $cache_setting) { - if (strlen($delta) >= 32) { - $delta = md5($delta); - } - if (db_table_exists('block') && $bid = db_query("SELECT bid FROM {block} WHERE module = 'views' AND delta = :delta", array( - ':delta' => $delta))->fetchField()) { - db_update('block') - ->fields(array( - 'cache' => $cache_setting, - )) - ->condition('module', 'views') - ->condition('delta', $delta) - ->execute(); + state()->set('views_block_hashes', $hashes); } } diff --git a/core/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc index 26e9c8b..2736e7d 100644 --- a/core/modules/comment/comment.admin.inc +++ b/core/modules/comment/comment.admin.inc @@ -128,7 +128,7 @@ function comment_admin_overview($form, &$form_state, $arg) { '#href' => 'node/' . $comment->nid, ), ), - 'changed' => format_date($comment->changed, 'short'), + 'changed' => format_date($comment->changed, 'system_short'), ); $links = array(); $links['edit'] = array( diff --git a/core/modules/comment/comment.tokens.inc b/core/modules/comment/comment.tokens.inc index c77cb67..b15d79e 100644 --- a/core/modules/comment/comment.tokens.inc +++ b/core/modules/comment/comment.tokens.inc @@ -186,11 +186,11 @@ function comment_tokens($type, $tokens, array $data = array(), array $options = break; case 'created': - $replacements[$original] = format_date($comment->created, 'medium', '', NULL, $langcode); + $replacements[$original] = format_date($comment->created, 'system_medium', '', NULL, $langcode); break; case 'changed': - $replacements[$original] = format_date($comment->changed, 'medium', '', NULL, $langcode); + $replacements[$original] = format_date($comment->changed, 'system_medium', '', NULL, $langcode); break; case 'node': diff --git a/core/modules/dblog/dblog.admin.inc b/core/modules/dblog/dblog.admin.inc index 3b56f45..2f45565 100644 --- a/core/modules/dblog/dblog.admin.inc +++ b/core/modules/dblog/dblog.admin.inc @@ -63,7 +63,7 @@ function dblog_overview() { // Cells array('class' => 'icon'), t($dblog->type), - format_date($dblog->timestamp, 'short'), + format_date($dblog->timestamp, 'system_short'), theme('dblog_message', array('event' => $dblog, 'link' => TRUE)), theme('username', array('account' => $dblog)), filter_xss($dblog->link), @@ -162,7 +162,7 @@ function dblog_event($id) { ), array( array('data' => t('Date'), 'header' => TRUE), - format_date($dblog->timestamp, 'long'), + format_date($dblog->timestamp, 'system_long'), ), array( array('data' => t('User'), 'header' => TRUE), diff --git a/core/modules/field/modules/text/config/text.settings.yml b/core/modules/field/modules/text/config/text.settings.yml new file mode 100644 index 0000000..1ff3cbc --- /dev/null +++ b/core/modules/field/modules/text/config/text.settings.yml @@ -0,0 +1 @@ +default_summary_length: 600 diff --git a/core/modules/field/modules/text/text.install b/core/modules/field/modules/text/text.install index a2ef0cf..72d879f 100644 --- a/core/modules/field/modules/text/text.install +++ b/core/modules/field/modules/text/text.install @@ -65,3 +65,14 @@ function text_field_schema($field) { ), ); } + +/** + * Moves teaser length from variable to config. + * + * @ingroup config_upgrade + */ +function text_update_8000() { + update_variables_to_config('text.settings', array( + 'teaser_length' => 'default_summary_length', + )); +} diff --git a/core/modules/field/modules/text/text.module b/core/modules/field/modules/text/text.module index efb0079..7e92375 100644 --- a/core/modules/field/modules/text/text.module +++ b/core/modules/field/modules/text/text.module @@ -229,9 +229,7 @@ function _text_sanitize($instance, $langcode, $item, $column) { function text_summary($text, $format = NULL, $size = NULL) { if (!isset($size)) { - // What used to be called 'teaser' is now called 'summary', but - // the variable 'teaser_length' is preserved for backwards compatibility. - $size = variable_get('teaser_length', 600); + $size = config('text.settings')->get('default_summary_length'); } // Find where the delimiter is in the body diff --git a/core/modules/file/lib/Drupal/file/Tests/FileTokenReplaceTest.php b/core/modules/file/lib/Drupal/file/Tests/FileTokenReplaceTest.php index 4d56b7b..187c41e 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileTokenReplaceTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileTokenReplaceTest.php @@ -56,8 +56,8 @@ function testFileTokenReplacement() { $tests['[file:mime]'] = check_plain($file->filemime); $tests['[file:size]'] = format_size($file->filesize); $tests['[file:url]'] = check_plain(file_create_url($file->uri)); - $tests['[file:timestamp]'] = format_date($file->timestamp, 'medium', '', NULL, $language_interface->langcode); - $tests['[file:timestamp:short]'] = format_date($file->timestamp, 'short', '', NULL, $language_interface->langcode); + $tests['[file:timestamp]'] = format_date($file->timestamp, 'system_medium', '', NULL, $language_interface->langcode); + $tests['[file:timestamp:short]'] = format_date($file->timestamp, 'system_short', '', NULL, $language_interface->langcode); $tests['[file:owner]'] = check_plain(user_format_name($this->admin_user)); $tests['[file:owner:uid]'] = $file->uid; diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index 3ebe97d..a7587a7 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -573,7 +573,7 @@ function locale_library_info_alter(&$libraries, $module) { 'ui' => array( 'datepicker' => array( 'isRTL' => $language_interface->direction == LANGUAGE_RTL, - 'firstDay' => variable_get('date_first_day', 0), + 'firstDay' => config('system.date')->get('first_day'), ), ), ), diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 22f5dd7..73e4380 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -274,11 +274,13 @@ function menu_save($menu) { case SAVED_NEW: // Make sure the menu is present in the active menus variable so that its // items may appear in the menu active trail. - // @see menu_set_active_menu_names() - $active_menus = variable_get('menu_default_active_menus', array_keys(menu_get_menus())); + // See menu_set_active_menu_names(). + $config = config('system.menu'); + + $active_menus = $config->get('active_menus_default') ?: array_keys(menu_get_menus()); if (!in_array($menu['menu_name'], $active_menus)) { $active_menus[] = $menu['menu_name']; - variable_set('menu_default_active_menus', $active_menus); + $config->set('active_menus_default', $active_menus); } module_invoke_all('menu_insert', $menu); diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index 2ca2d3e..ca80d2c 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -539,7 +539,7 @@ function node_admin_nodes() { 'type' => check_plain(node_get_type_label($node)), 'author' => theme('username', array('account' => $node)), 'status' => $node->status ? t('published') : t('not published'), - 'changed' => format_date($node->changed, 'short'), + 'changed' => format_date($node->changed, 'system_short'), ); if ($multilingual) { $options[$node->nid]['language_name'] = language_name($node->langcode); diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc index eef3d42..b5571bb 100644 --- a/core/modules/node/node.pages.inc +++ b/core/modules/node/node.pages.inc @@ -269,13 +269,13 @@ function node_revision_overview($node) { foreach ($revisions as $revision) { $row = array(); if ($revision->current_vid > 0) { - $row[] = array('data' => t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid"), '!username' => theme('username', array('account' => $revision)))) + $row[] = array('data' => t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'system_short'), "node/$node->nid"), '!username' => theme('username', array('account' => $revision)))) . (($revision->log != '') ? '

' . filter_xss($revision->log) . '

' : ''), 'class' => array('revision-current')); $row[] = array('data' => drupal_placeholder(t('current revision')), 'class' => array('revision-current')); } else { - $row[] = t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid/revisions/$revision->vid/view"), '!username' => theme('username', array('account' => $revision)))) + $row[] = t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'system_short'), "node/$node->nid/revisions/$revision->vid/view"), '!username' => theme('username', array('account' => $revision)))) . (($revision->log != '') ? '

' . filter_xss($revision->log) . '

' : ''); if ($revert_permission) { $links['revert'] = array( diff --git a/core/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc index 0bd1000..09aa1c6 100644 --- a/core/modules/node/node.tokens.inc +++ b/core/modules/node/node.tokens.inc @@ -163,11 +163,11 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr break; case 'created': - $replacements[$original] = format_date($node->created, 'medium', '', NULL, $langcode); + $replacements[$original] = format_date($node->created, 'system_medium', '', NULL, $langcode); break; case 'changed': - $replacements[$original] = format_date($node->changed, 'medium', '', NULL, $langcode); + $replacements[$original] = format_date($node->changed, 'system_medium', '', NULL, $langcode); break; } } diff --git a/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php index debb9cd..9822ff9 100644 --- a/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php +++ b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php @@ -41,8 +41,11 @@ function setUp() { */ function testRegisterUserWithEmailVerification() { config('user.settings')->set('verify_mail', TRUE)->save(); - variable_get('configurable_timezones', 1); - variable_set('date_default_timezone', 'Europe/Brussels'); + + config('system.date') + ->set('timezone.user.configurable', 1) + ->set('timezone.default', 'Europe/Brussels') + ->save(); // Tell openid_test.module to respond with these SREG fields. variable_set('openid_test_response', array( @@ -98,8 +101,11 @@ function testRegisterUserWithEmailVerification() { */ function testRegisterUserWithoutEmailVerification() { config('user.settings')->set('verify_mail', FALSE)->save(); - variable_get('configurable_timezones', 1); - variable_set('date_default_timezone', 'Europe/Brussels'); + + config('system.date') + ->set('timezone.user.configurable', 1) + ->set('timezone.default', 'Europe/Brussels') + ->save(); // Tell openid_test.module to respond with these SREG fields. variable_set('openid_test_response', array( @@ -139,8 +145,10 @@ function testRegisterUserWithoutEmailVerification() { * information (a username that is already taken, and no e-mail address). */ function testRegisterUserWithInvalidSreg() { - variable_get('configurable_timezones', 1); - variable_set('date_default_timezone', 'Europe/Brussels'); + config('system.date') + ->set('timezone.user.configurable', 1) + ->set('timezone.default', 'Europe/Brussels') + ->save(); // Tell openid_test.module to respond with these SREG fields. $web_user = $this->drupalCreateUser(array()); @@ -190,7 +198,6 @@ function testRegisterUserWithInvalidSreg() { * information (i.e. no username or e-mail address). */ function testRegisterUserWithoutSreg() { - variable_get('configurable_timezones', 1); // Load the front page to get the user login block. $this->drupalGet(''); @@ -230,7 +237,9 @@ function testRegisterUserWithoutSreg() { */ function testRegisterUserWithAXButNoSREG() { config('user.settings')->set('verify_mail', FALSE)->save(); - variable_set('date_default_timezone', 'Europe/Brussels'); + config('system.date') + ->set('timezone.default', 'Europe/Brussels') + ->save(); // Tell openid_test.module to respond with these AX fields. variable_set('openid_test_response', array( diff --git a/core/modules/search/search.pages.inc b/core/modules/search/search.pages.inc index b6a1930..9d99063 100644 --- a/core/modules/search/search.pages.inc +++ b/core/modules/search/search.pages.inc @@ -122,7 +122,7 @@ function template_preprocess_search_result(&$variables) { $info['user'] = $result['user']; } if (!empty($result['date'])) { - $info['date'] = format_date($result['date'], 'short'); + $info['date'] = format_date($result['date'], 'system_short'); } if (isset($result['extra']) && is_array($result['extra'])) { $info = array_merge($info, $result['extra']); diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php index f9bc3f4..ebadf43 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -228,7 +228,6 @@ protected function drupalCreateNode(array $settings = array()) { $settings += array( 'body' => array(LANGUAGE_NOT_SPECIFIED => array(array())), 'title' => $this->randomName(8), - 'comment' => COMMENT_NODE_OPEN, 'changed' => REQUEST_TIME, 'promote' => NODE_NOT_PROMOTED, 'revision' => 1, @@ -239,6 +238,13 @@ protected function drupalCreateNode(array $settings = array()) { 'langcode' => LANGUAGE_NOT_SPECIFIED, ); + // Add in comment settings for nodes. + if (module_exists('comment')) { + $settings += array( + 'comment' => COMMENT_NODE_OPEN, + ); + } + // Use the original node's created time for existing nodes. if (isset($settings['created']) && !isset($settings['date'])) { $settings['date'] = format_date($settings['created'], 'custom', 'Y-m-d H:i:s O'); diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsBlockVisitorsTest.php b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsBlockVisitorsTest.php index 4657d10..82990e3 100644 --- a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsBlockVisitorsTest.php +++ b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsBlockVisitorsTest.php @@ -50,7 +50,7 @@ function testIPAddressBlocking() { // Unblock the IP address. $this->clickLink('unban IP address'); - $this->assertRaw(t('Are you sure you want to delete %ip?', array('%ip' => $test_ip_address)), 'IP address deletion confirmation found.'); + $this->assertRaw(t('Are you sure you want to unblock %ip?', array('%ip' => $test_ip_address)), 'IP address deletion confirmation found.'); $edit = array(); $this->drupalPost('admin/config/people/ban/delete/1', NULL, t('Delete')); $this->assertRaw(t('The IP address %ip was deleted.', array('%ip' => $test_ip_address)), 'IP address deleted.'); diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php index 0b5909d..dd25d52 100644 --- a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php +++ b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php @@ -46,7 +46,7 @@ function testStatisticsTokenReplacement() { $tests['[node:total-count]'] = 1; $tests['[node:day-count]'] = 1; $tests['[node:last-view]'] = format_date($statistics['timestamp']); - $tests['[node:last-view:short]'] = format_date($statistics['timestamp'], 'short'); + $tests['[node:last-view:short]'] = format_date($statistics['timestamp'], 'system_short'); // Test to make sure that we generated something for each token. $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.'); diff --git a/core/modules/system/config/system.date.yml b/core/modules/system/config/system.date.yml new file mode 100644 index 0000000..3565022 --- /dev/null +++ b/core/modules/system/config/system.date.yml @@ -0,0 +1,60 @@ +first_day: '0' +country: + default: '' +timezone: + default: '' + user: + configurable: '1' + default: '0' + warn: '0' +formats: + system_long: + name: 'Default Long Date' + pattern: + php: 'l, F j, Y - H:i' + locked: 0 + system_medium: + name: 'Default Medium Date' + pattern: + php: 'D, m/d/Y - H:i' + locked: 0 + system_short: + name: 'Default Short Date' + pattern: + php: 'm/d/Y - H:i' + locked: 0 + html_datetime: + name: 'HTML Datetime' + pattern: + php: 'Y-m-d\TH:i:sO' + locked: 1 + html_date: + name: 'HTML Date' + pattern: + php: 'Y-m-d' + locked: 1 + html_time: + name: 'HTML Time' + pattern: + php: 'H:i:s' + locked: 1 + html_yearless_date: + name: 'HTML Yearless date' + pattern: + php: 'm-d' + locked: 1 + html_week: + name: 'HTML Week' + pattern: + php: 'Y-\WW' + locked: 1 + html_month: + name: 'HTML Month' + pattern: + php: 'Y-m' + locked: 1 + html_year: + name: 'HTML Year' + pattern: + php: 'Y' + locked: 1 diff --git a/core/modules/system/config/system.menu.yml b/core/modules/system/config/system.menu.yml new file mode 100644 index 0000000..e73636c --- /dev/null +++ b/core/modules/system/config/system.menu.yml @@ -0,0 +1 @@ +active_menus_default: [] diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php index d3cd9e6..5b73eac 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php @@ -35,15 +35,19 @@ public static function getInfo() { } function setUp() { - parent::setUp(); - variable_set('configurable_timezones', 1); - variable_set('date_format_long', 'l, j. F Y - G:i'); - variable_set('date_format_medium', 'j. F Y - G:i'); - variable_set('date_format_short', 'Y M j - g:ia'); + parent::setUp('language'); + config('system.date') + ->set('timezone.user.configurable', 1) + ->set('formats.system_long.pattern.php', 'l, j. F Y - G:i') + ->set('formats.system_medium.pattern.php', 'j. F Y - G:i') + ->set('formats.system_short.pattern.php', 'Y M j - g:ia') + ->save(); + variable_set('locale_custom_strings_' . self::LANGCODE, array( '' => array('Sunday' => 'domingo'), 'Long month name' => array('March' => 'marzo'), )); + $this->refreshVariables(); } @@ -57,20 +61,16 @@ function testAdminDefinedFormatDate() { // Add new date format. $admin_date_format = 'j M y'; - $edit = array('date_format' => $admin_date_format); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, 'Add format'); - - // Add new date type. $edit = array( - 'date_type' => 'Example Style', - 'machine_name' => 'example_style', - 'date_format' => $admin_date_format, + 'date_format_id' => 'example_style', + 'date_format_name' => 'Example Style', + 'date_format_pattern' => $admin_date_format, ); - $this->drupalPost('admin/config/regional/date-time/types/add', $edit, 'Add date type'); + $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); $timestamp = strtotime('2007-03-10T00:00:00+00:00'); $this->assertIdentical(format_date($timestamp, 'example_style', '', 'America/Los_Angeles'), '9 Mar 07', 'Test format_date() using an admin-defined date type.'); - $this->assertIdentical(format_date($timestamp, 'undefined_style'), format_date($timestamp, 'medium'), 'Test format_date() defaulting to medium when $type not found.'); + $this->assertIdentical(format_date($timestamp, 'undefined_style'), format_date($timestamp, 'system_medium'), 'Test format_date() defaulting to medium when $type not found.'); } /** @@ -123,9 +123,9 @@ function testFormatDate() { $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', 'Test a different language.'); $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London'), 'Monday, 26-Mar-07 01:00:00 BST', 'Test a different time zone.'); $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T'), 'domingo, 25-Mar-07 17:00:00 PDT', 'Test custom date format.'); - $this->assertIdentical(format_date($timestamp, 'long'), 'domingo, 25. marzo 2007 - 17:00', 'Test long date format.'); - $this->assertIdentical(format_date($timestamp, 'medium'), '25. marzo 2007 - 17:00', 'Test medium date format.'); - $this->assertIdentical(format_date($timestamp, 'short'), '2007 Mar 25 - 5:00pm', 'Test short date format.'); + $this->assertIdentical(format_date($timestamp, 'system_long'), 'domingo, 25. marzo 2007 - 17:00', 'Test long date format.'); + $this->assertIdentical(format_date($timestamp, 'system_medium'), '25. marzo 2007 - 17:00', 'Test medium date format.'); + $this->assertIdentical(format_date($timestamp, 'system_short'), '2007 Mar 25 - 5:00pm', 'Test short date format.'); $this->assertIdentical(format_date($timestamp), '25. marzo 2007 - 17:00', 'Test default date format.'); // Test HTML time element formats. $this->assertIdentical(format_date($timestamp, 'html_datetime'), '2007-03-25T17:00:00-0700', 'Test html_datetime date format.'); diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php index 10f49b9..172973d 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php @@ -19,7 +19,7 @@ class DateFormatsLanguageTest extends WebTestBase { * * @var array */ - public static $modules = array('node', 'language'); + public static $modules = array('node', 'locale'); public static function getInfo() { return array( @@ -57,20 +57,39 @@ function testLocalizeDateFormats() { ); $this->drupalPost('admin/config/regional/language/detection', $edit, t('Save settings')); + // Add new date format for French. + $edit = array( + 'date_format_id' => 'example_style_fr', + 'date_format_name' => 'Example Style', + 'date_format_pattern' => 'd.m.Y - H:i', + 'date_langcode[]' => array('fr'), + ); + $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + + // Add new date format for English. + $edit = array( + 'date_format_id' => 'example_style_en', + 'date_format_name' => 'Example Style', + 'date_format_pattern' => 'j M Y - g:ia', + 'date_langcode[]' => array('en'), + ); + $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + // Configure date formats. $this->drupalGet('admin/config/regional/date-time/locale'); $this->assertText('French', 'Configured languages appear.'); $edit = array( - 'date_format_long' => 'd.m.Y - H:i', - 'date_format_medium' => 'd.m.Y - H:i', - 'date_format_short' => 'd.m.Y - H:i', + 'date_format_system_long' => 'example_style_fr', + 'date_format_system_medium' => 'example_style_fr', + 'date_format_system_short' => 'example_style_fr', ); $this->drupalPost('admin/config/regional/date-time/locale/fr/edit', $edit, t('Save configuration')); $this->assertText(t('Configuration saved.'), 'French date formats updated.'); + $edit = array( - 'date_format_long' => 'j M Y - g:ia', - 'date_format_medium' => 'j M Y - g:ia', - 'date_format_short' => 'j M Y - g:ia', + 'date_format_system_long' => 'example_style_en', + 'date_format_system_medium' => 'example_style_en', + 'date_format_system_short' => 'example_style_en', ); $this->drupalPost('admin/config/regional/date-time/locale/en/edit', $edit, t('Save configuration')); $this->assertText(t('Configuration saved.'), 'English date formats updated.'); @@ -85,5 +104,10 @@ function testLocalizeDateFormats() { $this->drupalGet('fr/node/' . $node->nid); $french_date = format_date($node->created, 'custom', 'd.m.Y'); $this->assertText($french_date, 'French date format appears'); + + // Make sure we can reset dates back to default. + $this->drupalPost('admin/config/regional/date-time/locale/en/reset', array(), t('Reset')); + $this->drupalGet('node/' . $node->nid); + $this->assertNoText($english_date, 'English date format does not appear'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php index 8483da2..53dccbe 100644 --- a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php @@ -38,15 +38,16 @@ function setUp() { $this->drupalLogin($this->admin_user); } - /** * Test time zones and DST handling. */ function testTimeZoneHandling() { // Setup date/time settings for Honolulu time. - variable_set('date_default_timezone', 'Pacific/Honolulu'); - variable_set('configurable_timezones', 0); - variable_set('date_format_medium', 'Y-m-d H:i:s O'); + $config = config('system.date') + ->set('timezone.default', 'Pacific/Honolulu') + ->set('timezone.user.configurable', 0) + ->set('formats.system_medium.pattern.php', 'Y-m-d H:i:s O') + ->save(); // Create some nodes with different authored-on dates. $date1 = '2007-01-31 21:00:00 -1000'; @@ -61,7 +62,7 @@ function testTimeZoneHandling() { $this->assertText('2007-07-31 21:00:00 -1000', 'Date should be identical, with GMT offset of -10 hours.'); // Set time zone to Los Angeles time. - variable_set('date_default_timezone', 'America/Los_Angeles'); + $config->set('timezone.default', 'America/Los_Angeles')->save(); // Confirm date format and time zone. $this->drupalGet("node/$node1->nid"); @@ -71,64 +72,33 @@ function testTimeZoneHandling() { } /** - * Test date type configuration. - */ - function testDateTypeConfiguration() { - // Confirm system date types appear. - $this->drupalGet('admin/config/regional/date-time'); - $this->assertText(t('Medium'), 'System date types appear in date type list.'); - $this->assertNoRaw('href="/admin/config/regional/date-time/types/medium/delete"', 'No delete link appear for system date types.'); - - // Add custom date type. - $this->clickLink(t('Add date type')); - $date_type = strtolower($this->randomName(8)); - $machine_name = 'machine_' . $date_type; - $date_format = 'd.m.Y - H:i'; - $edit = array( - 'date_type' => $date_type, - 'machine_name' => $machine_name, - 'date_format' => $date_format, - ); - $this->drupalPost('admin/config/regional/date-time/types/add', $edit, t('Add date type')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.'); - $this->assertText(t('New date type added successfully.'), 'Date type added confirmation message appears.'); - $this->assertText($date_type, 'Custom date type appears in the date type list.'); - $this->assertText(t('delete'), 'Delete link for custom date type appears.'); - - // Delete custom date type. - $this->clickLink(t('delete')); - $this->drupalPost('admin/config/regional/date-time/types/' . $machine_name . '/delete', array(), t('Remove')); - $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.'); - $this->assertText(t('Removed date type ' . $date_type), 'Custom date type removed.'); - } - - /** * Test date format configuration. */ function testDateFormatConfiguration() { // Confirm 'no custom date formats available' message appears. $this->drupalGet('admin/config/regional/date-time/formats'); - $this->assertText(t('No custom date formats available.'), 'No custom date formats message appears.'); // Add custom date format. $this->clickLink(t('Add format')); + $date_format_id = strtolower($this->randomName(8)); + $name = ucwords($date_format_id); + $date_format = 'd.m.Y - H:i'; $edit = array( - 'date_format' => 'Y', + 'date_format_id' => $date_format_id, + 'date_format_name' => $name, + 'date_format_pattern' => $date_format, ); $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.'); - $this->assertNoText(t('No custom date formats available.'), 'No custom date formats message does not appear.'); - $this->assertText(t('Custom date format added.'), 'Custom date format added.'); - - // Ensure custom date format appears in date type configuration options. - $this->drupalGet('admin/config/regional/date-time'); - $this->assertRaw('