This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/eva.module b/eva.module | |
| index efb0da2..1bbc334 100755 | |
| --- a/eva.module | |
| +++ b/eva.module | |
| @@ -60,6 +60,18 @@ function eva_field_extra_fields() { | |
| * we'll use a list of special cases to trigger this special handling. | |
| */ | |
| function eva_entity_view_alter(&$build, $type) { | |
| + // This is a terrible hack to avoid EVA going nuts on trying to inject views where it absolutely should not. | |
| + // We are trying to block EVA to run into recursion when viewing a node that is referenced via an EVA to show |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/relation_endpoint.install b/relation_endpoint.install | |
| index cb3297a..61ed928 100644 | |
| --- a/relation_endpoint.install | |
| +++ b/relation_endpoint.install | |
| @@ -41,24 +41,3 @@ function relation_endpoint_field_schema() { | |
| ), | |
| ); | |
| } | |
| - | |
| -/** |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/js/gigya.js b/js/gigya.js | |
| index cadc4d9..5cda48f 100644 | |
| --- a/js/gigya.js | |
| +++ b/js/gigya.js | |
| @@ -66,7 +66,7 @@ | |
| Drupal.gigya.raasRegLogin = function (data) { | |
| var base = Drupal.settings.gigya.raas.linkId || $('.gigya-raas-login').attr('id'); | |
| var element_settings = {}; | |
| - element_settings.url = Drupal.settings.basePath + 'raas-login'; | |
| + element_settings.url = Drupal.settings.basePath + 'fr/raas-login'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/og.info b/og.info | |
| index da3014e..12a603b 100644 | |
| --- a/og.info | |
| +++ b/og.info | |
| @@ -6,6 +6,7 @@ dependencies[] = list | |
| dependencies[] = text | |
| dependencies[] = entity | |
| dependencies[] = entityreference | |
| +dependencies[] = image | |
| core = 7.x |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/field_group.module b/field_group.module | |
| index da1a791..466f666 100755 | |
| --- a/field_group.module | |
| +++ b/field_group.module | |
| @@ -1861,8 +1861,10 @@ function field_group_attach_groups(&$element, $view_mode, $form_state = array()) | |
| // Create a lookup array. | |
| $group_children = array(); | |
| foreach ($element['#groups'] as $group_name => $group) { | |
| - foreach ($group->children as $child) { | |
| - $group_children[$child] = $group_name; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <?php | |
| /** | |
| * Implements hook_node_view(). | |
| */ | |
| function arte_infos_program_node_view($node, $view_mode, $langcode) { | |
| ... | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php b/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php | |
| index 4b3e429..ad405e0 100644 | |
| --- a/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php | |
| +++ b/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php | |
| @@ -553,7 +553,7 @@ class LdapAuthorizationConsumerOG extends LdapAuthorizationConsumerAbstract { | |
| * - remove and grant og roles | |
| * - flush appropriate caches | |
| */ | |
| - debug("og_actions"); debug($og_actions); debug("user_auth_data"); debug($user_auth_data); | |
| + //debug("og_actions"); debug($og_actions); debug("user_auth_data"); debug($user_auth_data); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/eva.module b/eva.module | |
| index 5de36e1..ea8dab3 100755 | |
| --- a/eva.module | |
| +++ b/eva.module | |
| @@ -52,54 +52,6 @@ function eva_field_extra_fields() { | |
| } | |
| /** | |
| - * Implements hook_entity_view_alter(). | |
| - * |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| language: php | |
| # | |
| # Important to note, this is the version of PHP used to run this build, not the | |
| # one used to run your Drupal installation. Ensure compatibility with the Drush | |
| # and Terminus versions you're using for this build. | |
| # | |
| php: | |
| - 5.3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/libraries.module b/libraries.module | |
| index 687fa29..782792b 100644 | |
| --- a/libraries.module | |
| +++ b/libraries.module | |
| @@ -82,6 +82,9 @@ function libraries_get_libraries() { | |
| // Always search sites/all/libraries. | |
| $searchdir[] = 'sites/all/libraries'; | |
| + // Patch until we sort out https://drupal.org/node/1811486 and drupal_get_profiles actually exists. Profile inheritance is still relatively new, but we need this new, hence the hardcoded hack. Expected to be removed in the next cycle of D7 | |
| + $searchdir[] = drupal_get_path('profile', 'mz') . "/libraries"; |