31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
diff -Naur commons.orig/drupal-org.make commons/drupal-org.make
|
|
--- commons.orig/drupal-org.make 2017-08-30 21:45:23.000000000 +0200
|
|
+++ commons/drupal-org.make 2017-08-30 22:13:43.000000000 +0200
|
|
@@ -161,6 +161,10 @@
|
|
projects[flag][subdir] = "contrib"
|
|
projects[flag][version] = "3.9"
|
|
|
|
+; Fix Fatal error: Unsupported operand types in flag_flag.inc on line 132
|
|
+; https://www.drupal.org/node/2347297
|
|
+projects[flag][patch][] = "patches/0001-commons-flag-fix-unsupported-operands.patch"
|
|
+
|
|
projects[flag_abuse][type] = "module"
|
|
projects[flag_abuse][subdir] = "contrib"
|
|
projects[flag_abuse][version] = "2.0"
|
|
diff -Naur commons.orig/patches/0001-commons-flag-fix-unsupported-operands.patch commons/patches/0001-commons-flag-fix-unsupported-operands.patch
|
|
--- commons.orig/patches/0001-commons-flag-fix-unsupported-operands.patch 1970-01-01 01:00:00.000000000 +0100
|
|
+++ commons/patches/0001-commons-flag-fix-unsupported-operands.patch 2017-08-30 22:12:48.000000000 +0200
|
|
@@ -0,0 +1,12 @@
|
|
+diff -Naur a/includes/flag/flag_flag.inc b/includes/flag/flag_flag.inc
|
|
+--- a/includes/flag/flag_flag.inc 2017-08-30 21:45:26.000000000 +0200
|
|
++++ b/includes/flag/flag_flag.inc 2017-08-30 21:48:09.000000000 +0200
|
|
+@@ -129,7 +129,7 @@
|
|
+
|
|
+ // Populate the options with the defaults.
|
|
+ $options = (array) unserialize($row->options);
|
|
+- $options += $flag->options();
|
|
++ $options = array_merge($options, $flag->options());
|
|
+
|
|
+ // Make the unserialized options accessible as normal properties.
|
|
+ foreach ($options as $option => $value) {
|