Merge branch 'release/1.3.2'

epfl-si · Mar 27, 2019 · 89311f5 · 89311f5
2 parents fe7c82d + 6d14fd2
commit 89311f5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+*1.3.2* (2019-03-28)
+- Fix PHP notice messages
+
 *1.3.1* (2019-03-21)
 - Font are fetched from root www
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.1
+1.3.2
diff --git a/menus/submenu.php b/menus/submenu.php
@@ -21,7 +21,8 @@ function submenu_limit( $items, $args ) {
 
     $submenu_type = $args->submenu_type ?: 'all';
 
-    $current_menu_item = reset(wp_filter_object_list( $items, array( 'current' => true ) ));
+    $current_menu_items = wp_filter_object_list( $items, array( 'current' => true ) );
+    $current_menu_item = reset($current_menu_items);
     if ($current_menu_item) array_push($current_menu_item->classes, 'active');
 
     $selectedIds = [];
@@ -38,9 +39,10 @@ function submenu_limit( $items, $args ) {
       $selectedIds = submenu_get_direct_children_ids( $parent_menu_item->ID ?: 0 , $items );
 
     } else if ($submenu_type == 'all') {
-      $parent_menu_item = reset(wp_filter_object_list( $items, array( 'current_item_parent' => true ) ));
-      $siblings = submenu_get_direct_children_ids( $parent_menu_item->ID ?: 0 , $items );
-      $children = submenu_get_direct_children_ids( $current_menu_item->ID ?: 0 , $items );
+      $parent_menu_items = wp_filter_object_list( $items, array( 'current_item_parent' => true ) );
+      $parent_menu_item = reset($parent_menu_items);
+      $siblings = submenu_get_direct_children_ids( ($parent_menu_item && $parent_menu_item->ID) ?: 0 , $items );
+      $children = submenu_get_direct_children_ids( ($current_menu_item && $current_menu_item->ID) ?: 0 , $items );
       $selectedIds = array_merge($siblings, $children);
     }
 
@@ -83,4 +85,4 @@ function submenu_get_recursive_children_ids( $id, $items ) {
   }
 
   return $ids;
-}
+}
diff --git a/sidebar.php b/sidebar.php
@@ -24,8 +24,8 @@
 }
 
 // recover current post and menu item
-$items = wp_get_nav_menu_items(get_current_menu_slug());
-$item = reset(wp_filter_object_list( $items, ['object_id' => $post->ID]));
+$items = wp_filter_object_list( wp_get_nav_menu_items(get_current_menu_slug()), ['object_id' => $post->ID]);
+$item = reset($items);
 
 // to display correctly the menu on level 1 pages, we need to add '.current-menu-parent' to the wrapper
 $classes = '';

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme URI:
 Author: Antistatique.net
 Author URI: http://antistatique.net/
 Description: Description
-Version: 1.3.1
+Version: 1.3.2
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl