Browse Source

Fix flag module unsupported operand types issue

The flag module had an issue on php5.5.9, this patch applies a fix
for that.

https://www.drupal.org/node/2347297

Change-Id: Icdd619da23e7f38e5577b464d231aa1903226721
tags/0.49^0
Marton Kiss 1 year ago
parent
commit
e825e37696
2 changed files with 30 additions and 0 deletions
  1. 1
    0
      commons.make
  2. 29
    0
      patches/0020-commons-flag-unsupported-operands.patch

+ 1
- 0
commons.make View File

@@ -17,3 +17,4 @@ projects[commons][patch][] = "patches/0016-commons-file_entity-2.3.patch"
17 17
 projects[commons][patch][] = "patches/0017-commons-media-2.9.patch"
18 18
 projects[commons][patch][] = "patches/0018-commons-views-3.18.patch"
19 19
 projects[commons][patch][] = "patches/0019-commons-entity-reference-1.5.patch"
20
+projects[commons][patch][] = "patches/0020-commons-flag-unsupported-operands.patch"

+ 29
- 0
patches/0020-commons-flag-unsupported-operands.patch View File

@@ -0,0 +1,30 @@
1
+diff -Naur commons.orig/drupal-org.make commons/drupal-org.make
2
+--- commons.orig/drupal-org.make	2017-08-30 21:45:23.000000000 +0200
3
++++ commons/drupal-org.make	2017-08-30 22:13:43.000000000 +0200
4
+@@ -161,6 +161,10 @@
5
+ projects[flag][subdir] = "contrib"
6
+ projects[flag][version] = "3.9"
7
+
8
++; Fix Fatal error: Unsupported operand types in flag_flag.inc on line 132
9
++; https://www.drupal.org/node/2347297
10
++projects[flag][patch][] = "patches/0001-commons-flag-fix-unsupported-operands.patch"
11
++
12
+ projects[flag_abuse][type] = "module"
13
+ projects[flag_abuse][subdir] = "contrib"
14
+ projects[flag_abuse][version] = "2.0"
15
+diff -Naur commons.orig/patches/0001-commons-flag-fix-unsupported-operands.patch commons/patches/0001-commons-flag-fix-unsupported-operands.patch
16
+--- commons.orig/patches/0001-commons-flag-fix-unsupported-operands.patch	1970-01-01 01:00:00.000000000 +0100
17
++++ commons/patches/0001-commons-flag-fix-unsupported-operands.patch	2017-08-30 22:12:48.000000000 +0200
18
+@@ -0,0 +1,12 @@
19
++diff -Naur a/includes/flag/flag_flag.inc b/includes/flag/flag_flag.inc
20
++--- a/includes/flag/flag_flag.inc	2017-08-30 21:45:26.000000000 +0200
21
+++++ b/includes/flag/flag_flag.inc	2017-08-30 21:48:09.000000000 +0200
22
++@@ -129,7 +129,7 @@
23
++
24
++     // Populate the options with the defaults.
25
++     $options = (array) unserialize($row->options);
26
++-    $options += $flag->options();
27
++
28
++     // Make the unserialized options accessible as normal properties.
29
++     foreach ($options as $option => $value) {

Loading…
Cancel
Save