Skip to content

Commit 338e7af

Browse files
joelpittetamitaibu
joelpittet
authored andcommitted
Issue #2620280 by joelpittet: PHP7 possible compatibility issue
1 parent a184873 commit 338e7af

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

includes/message.admin.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class MessageTypeUIController extends EntityDefaultUIController {
2121
form_state_values_clean($form_state);
2222
foreach ($form_state['values'] as $key => $value) {
2323
if ($key != 'message_type_fields') {
24-
$entity->$key = $value;
24+
$entity->{$key} = $value;
2525
}
2626
}
2727
// Invoke all specified builders for copying form values to entity

includes/message.message_type.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class MessageType extends Entity {
165165
}
166166

167167
// Let the metadata wrapper deal with the language.
168-
$property = $property->language($langcode)->$options['field name'];
168+
$property = $property->language($langcode)->{$options['field name']};
169169

170170
$delta = $options['partial delta'];
171171
$count = $field['cardinality'] == 1 ? 1 : $property->count();

includes/views/handlers/message_handler_field_message_render.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class message_handler_field_message_render extends views_handler_field {
7272

7373
function render($values) {
7474
$field_alias = $this->field_alias;
75-
if (!empty($values->$field_alias) && $message = message_load($values->$field_alias)) {
75+
if (!empty($values->{$field_alias}) && $message = message_load($values->{$field_alias})) {
7676
$options = array(
7777
'field name' => $this->options['field_name'],
7878
'partials' => $this->options['partials'],

message.module

+1-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ function _message_delete_messages($field_names, $entity_id, $last_mid = 0, $rang
513513
// check each entity.
514514
$refrences_count = 0;
515515
for ($i = 0; $i < $count; $i++) {
516-
if ($wrapper->$field_name->get($i)->value()) {
516+
if ($wrapper->{$field_name}->get($i)->value()) {
517517
$refrences_count++;
518518
}
519519
}

0 commit comments

Comments
 (0)