From 2c186c8bd5ab9385a066e658a769d2ed4135a13c Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Wed, 26 Jul 2017 20:31:02 +0200 Subject: [PATCH] Compatibility with PHP 5.4 --- sites/all/modules/cck/includes/content.admin.inc | 3 ++- sites/all/modules/cck/includes/content.crud.inc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sites/all/modules/cck/includes/content.admin.inc b/sites/all/modules/cck/includes/content.admin.inc index e22c744..b1f0c4b 100644 --- a/sites/all/modules/cck/includes/content.admin.inc +++ b/sites/all/modules/cck/includes/content.admin.inc @@ -1294,7 +1294,8 @@ function content_field_edit_form_validate($form, &$form_state) { elseif (!empty($form_values['default_value_widget'])) { // Fields that handle their own multiple values may use an expected // value as the top-level key, so just pop off the top element. - $key = array_shift(array_keys($form_values['default_value_widget'])); + $keys = array_keys($form_values['default_value_widget']); + $key = array_shift($keys); $default_value = $form_values['default_value_widget'][$key]; $is_code = FALSE; form_set_value(array('#parents' => array('default_value_php')), '', $form_state); diff --git a/sites/all/modules/cck/includes/content.crud.inc b/sites/all/modules/cck/includes/content.crud.inc index 4e9178c..cf56f5d 100644 --- a/sites/all/modules/cck/includes/content.crud.inc +++ b/sites/all/modules/cck/includes/content.crud.inc @@ -546,7 +546,8 @@ function content_field_instance_delete($field_name, $type_name, $rebuild = TRUE) include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc'); // Get the previous field value. - $field = array_pop(content_field_instance_read(array('field_name' => $field_name, 'type_name' => $type_name))); + $fields = content_field_instance_read(array('field_name' => $field_name, 'type_name' => $type_name)); + $field = array_pop($fields); // Invoke hook_content_fieldapi(). module_invoke_all('content_fieldapi', 'delete instance', $field);