summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Kiss <marton.kiss@gmail.com>2017-08-30 22:58:52 +0200
committerMarton Kiss <marton.kiss@gmail.com>2017-08-30 22:58:52 +0200
commite825e376967db60e57a04d90fc8c7b40c50be527 (patch)
treed483c78c8cb9dbed859e7e8a3fd8d4b9900cf48f
parentfd4fd96740e8ccebe554fce29cda5167db2d09c9 (diff)
Fix flag module unsupported operand types issueHEAD0.49master
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
Notes
Notes (review): Code-Review+2: Marton Kiss <marton.kiss@gmail.com> Workflow+1: Marton Kiss <marton.kiss@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 31 Aug 2017 05:10:06 +0000 Reviewed-on: https://review.openstack.org/499340 Project: openstack-infra/groups Branch: refs/heads/master
-rw-r--r--commons.make1
-rw-r--r--patches/0020-commons-flag-unsupported-operands.patch30
2 files changed, 31 insertions, 0 deletions
diff --git a/commons.make b/commons.make
index eb043aa..eb77c9a 100644
--- a/commons.make
+++ b/commons.make
@@ -17,3 +17,4 @@ projects[commons][patch][] = "patches/0016-commons-file_entity-2.3.patch"
17projects[commons][patch][] = "patches/0017-commons-media-2.9.patch" 17projects[commons][patch][] = "patches/0017-commons-media-2.9.patch"
18projects[commons][patch][] = "patches/0018-commons-views-3.18.patch" 18projects[commons][patch][] = "patches/0018-commons-views-3.18.patch"
19projects[commons][patch][] = "patches/0019-commons-entity-reference-1.5.patch" 19projects[commons][patch][] = "patches/0019-commons-entity-reference-1.5.patch"
20projects[commons][patch][] = "patches/0020-commons-flag-unsupported-operands.patch"
diff --git a/patches/0020-commons-flag-unsupported-operands.patch b/patches/0020-commons-flag-unsupported-operands.patch
new file mode 100644
index 0000000..88c66f3
--- /dev/null
+++ b/patches/0020-commons-flag-unsupported-operands.patch
@@ -0,0 +1,30 @@
1diff -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"
15diff -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++ $options = array_merge($options, $flag->options());
28+
29+ // Make the unserialized options accessible as normal properties.
30+ foreach ($options as $option => $value) {