openinfra
/
groups
Code Issues Proposed changes

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
This commit is contained in:
Marton Kiss 2014-10-29 07:35:39 +01:00
parent 08d52386f2
commit 20ef08a6e0
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drupal-org.make
View File

@ -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

14
patches/0003-fix-og-subscribe-link-classes.patch Normal file
View File

@ -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'],