Skip to content

small php7 issues #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bond708 wants to merge 1 commit into
base: 7.x-2.x
Choose a base branch
from
Open

small php7 issues #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions drupal-org.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ projects[webform_clear][patch][2471671] = https://www.drupal.org/files/issues/24
; Token replacement (pathauto patterns) completely broken
; https://www.drupal.org/node/2399645
projects[hansel][patch][2399645] = https://www.drupal.org/files/issues/hansel-broken-token-generation-2399645-1.patch
projects[hansel][patch][35] = "modules/patches/35-Parameter-must-be-an-array-or-an-object-that-implements-Countable.patch"

; Link
; URL validation rejects existing valid content after upgrade to 7.x-1.4
Expand Down
34 changes: 18 additions & 16 deletions modules/features/wim_faq/wim_faq.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,24 @@ function wim_faq_views_pre_render($view) {
*/
function wim_faq_form_felix_attributes_form_alter(&$form, &$form_state, $form_id) {
$felix_block = $form['#felix_block'];
$felix_block_config = $felix_block->data['config'];
if ($felix_block->delta === 'faq-faq_overview_block') {
$faq_vocabulary = taxonomy_vocabulary_machine_name_load('faq_categories');
$faq_terms = taxonomy_get_tree($faq_vocabulary->vid);
$faq_categories = [];
foreach ($faq_terms as $faq_term) {
$faq_categories[$faq_term->tid] = $faq_term->name;
}
if (!empty($faq_categories)) {
$form['faq_category'] = [
'#type' => 'select',
'#title' => t('FAQ category'),
'#options' => $faq_categories,
'#default_value' => $felix_block_config['faq_category'],
'#required' => TRUE,
];
if ($felix_block->data['config']){
$felix_block_config = $felix_block->data['config'];
if ($felix_block->delta === 'faq-faq_overview_block') {
$faq_vocabulary = taxonomy_vocabulary_machine_name_load('faq_categories');
$faq_terms = taxonomy_get_tree($faq_vocabulary->vid);
$faq_categories = [];
foreach ($faq_terms as $faq_term) {
$faq_categories[$faq_term->tid] = $faq_term->name;
}
if (!empty($faq_categories)) {
$form['faq_category'] = [
'#type' => 'select',
'#title' => t('FAQ category'),
'#options' => $faq_categories,
'#default_value' => $felix_block_config['faq_category'],
'#required' => TRUE,
];
}
}
}
}
Expand Down
24 changes: 24 additions & 0 deletions modules/patches/35-Parameter-must-be-an-array-or-an-object-that-implements-Countable.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/hansel.module b/hansel.module
index 96e89b0..ab1c519 100644
--- a/hansel.module
+++ b/hansel.module
@@ -628,12 +628,14 @@ function hansel_get_breadcrumbs($test = FALSE, $plaintext = FALSE) {
break; // Break while (TRUE) loop
}
$crumbs = call_user_func($callback, $rules[$rid]->crumb_action_arguments);
- for ($i = 0; $i < count($crumbs); $i++) {
- if (empty($crumbs[$i]) || (is_array($crumbs[$i]) && empty($crumbs[$i]['title']))) {
- // Skip empty breadcrumbs in output.
- continue;
+ if (is_array($crumbs)) {
+ for ($i = 0; $i < count($crumbs); $i++) {
+ if (empty($crumbs[$i]) || (is_array($crumbs[$i]) && empty($crumbs[$i]['title']))) {
+ // Skip empty breadcrumbs in output.
+ continue;
+ }
+ $breadcrumbs[] = $crumbs[$i];
}
- $breadcrumbs[] = $crumbs[$i];
}
!$test or _hansel_test_message(t('Added %count crumb(s)', array('%count' => count($crumbs))));
}
2 changes: 1 addition & 1 deletion themes/wimbase/includes/theme.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ function wimbase_menu_link(array $variables) {
$menu_icon = isset($element['#localized_options']['menu_icon']) ? $element['#localized_options']['menu_icon'] : NULL;
// Add menu item icon.
if (is_array($menu_icon) && $menu_icon['enable'] && $menu_icon['path']) {
$icon = '<span><img alt="' . $element['#title'] . '" class="item-icon rs_skip" src="' . image_style_url($menu_icon['image_style'], $menu_icon['path']) . '"></span>';
$icon = '<span><img class="item-icon rs_skip" src="' . image_style_url($menu_icon['image_style'], $menu_icon['path']) . '"></span>';
$element['#localized_options']['html'] = TRUE;
}
if ($element['#below']) {
Expand Down