From 20ef08a6e0d40b782bc788a868989830eee6da10 Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Wed, 29 Oct 2014 07:35:39 +0100
Subject: [PATCH] Organic groups patch to fix class override bug in
 subscription field

Organic groups 2.7 and actual dev version contain a bug that overrides
subscription field classes when it contains another #option attribute
insted of merge. drupal.org.make og module contains the local patch
until this bug is fixed in a stable upstream release.

Change-Id: Ic729e368c1eb07b56feef187bf3e1fe4c2cc31a2
---
 drupal-org.make                                  |  2 ++
 patches/0003-fix-og-subscribe-link-classes.patch | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 patches/0003-fix-og-subscribe-link-classes.patch

diff --git a/drupal-org.make b/drupal-org.make
index 62ce087..229c566 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -308,6 +308,8 @@ projects[oembed][download][revision] = "9aa5303"
 projects[og][type] = "module"
 projects[og][subdir] = "contrib"
 projects[og][version] = "2.7"
+; Fix missing class of login links in subscription field
+projects[og][patch][] = "patches/0003-fix-og-subscribe-link-classes.patch"
 
 ; Auto-assign role to group manager broken on groups with overridden roles.
 ; https://drupal.org/node/2005800#comment-7684873
diff --git a/patches/0003-fix-og-subscribe-link-classes.patch b/patches/0003-fix-og-subscribe-link-classes.patch
new file mode 100644
index 0000000..fec28c3
--- /dev/null
+++ b/patches/0003-fix-og-subscribe-link-classes.patch
@@ -0,0 +1,14 @@
+diff -Naur og.orig/og_ui/og_ui.module og/og_ui/og_ui.module
+--- og.orig/og_ui/og_ui.module	2014-10-27 16:43:19.000000000 +0100
++++ og/og_ui/og_ui.module	2014-10-27 16:45:02.000000000 +0100
+@@ -694,7 +694,9 @@
+       }
+ 
+       if (!empty($links['title'])) {
+-        $links += array('options' => array('attributes' => array('title' => $links['title'], 'class' => array($links['class']))));
++        // Patch upstream, we need array_merge_recursive here.
++        $links_options = array('options' => array('attributes' => array('title' => $links['title'], 'class' => array($links['class']))));
++        $links = array_merge_recursive($links, $links_options);
+         $element[0] = array(
+           '#type' => 'link',
+           '#title' => $links['title'],