updated core to 7.73
This commit is contained in:
@@ -1026,6 +1026,10 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
|
||||
|
||||
$instance['display'][$view_mode]['type'] = $formatter_type;
|
||||
$formatter = field_info_formatter_types($formatter_type);
|
||||
// For hidden fields, $formatter will be NULL, but we expect an array later.
|
||||
// To maintain BC, but avoid PHP 7.4 Notices, ensure $formatter is an array
|
||||
// with a 'module' element.
|
||||
$formatter['module'] = isset($formatter['module']) ? $formatter['module'] : '';
|
||||
$instance['display'][$view_mode]['module'] = $formatter['module'];
|
||||
$instance['display'][$view_mode]['settings'] = $settings;
|
||||
|
||||
|
@@ -6,7 +6,7 @@ core = 7.x
|
||||
dependencies[] = field
|
||||
files[] = field_ui.test
|
||||
|
||||
; Information added by Drupal.org packaging script on 2019-12-18
|
||||
version = "7.69"
|
||||
; Information added by Drupal.org packaging script on 2020-09-16
|
||||
version = "7.73"
|
||||
project = "drupal"
|
||||
datestamp = "1576696221"
|
||||
datestamp = "1600272641"
|
||||
|
@@ -265,6 +265,12 @@ function field_ui_menu_title($instance) {
|
||||
* Menu access callback for the 'view mode display settings' pages.
|
||||
*/
|
||||
function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $access_callback) {
|
||||
// It's good practice to call func_get_args() at the beginning of a function
|
||||
// to avoid problems with function parameters being modified later. The
|
||||
// behavior of func_get_args() changed in PHP7.
|
||||
// @see https://www.php.net/manual/en/migration70.incompatible.php#migration70.incompatible.other.func-parameter-modified
|
||||
$all_args = func_get_args();
|
||||
|
||||
// First, determine visibility according to the 'use custom display'
|
||||
// setting for the view mode.
|
||||
$bundle = field_extract_bundle($entity_type, $bundle);
|
||||
@@ -275,7 +281,6 @@ function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $acc
|
||||
// part of _menu_check_access().
|
||||
if ($visibility) {
|
||||
// Grab the variable 'access arguments' part.
|
||||
$all_args = func_get_args();
|
||||
$args = array_slice($all_args, 4);
|
||||
$callback = empty($access_callback) ? 0 : trim($access_callback);
|
||||
if (is_numeric($callback)) {
|
||||
|
Reference in New Issue
Block a user