@@ -208,10 +208,11 @@ public function reorder_parts($parts, $beforekey = null, $reorderrelative = true
208208 */
209209 public function widgets ($ region , $ place )
210210 {
211- if (count (@$ this ->content ['widgets ' ][$ region ][$ place ])) {
211+ $ widgetsHere = isset ($ this ->content ['widgets ' ][$ region ][$ place ]) ? $ this ->content ['widgets ' ][$ region ][$ place ] : array ();
212+ if (is_array ($ widgetsHere ) && count ($ widgetsHere ) > 0 ) {
212213 $ this ->output ('<div class="qa-widgets- ' . $ region . ' qa-widgets- ' . $ region . '- ' . $ place . '"> ' );
213214
214- foreach ($ this -> content [ ' widgets ' ][ $ region ][ $ place ] as $ module ) {
215+ foreach ($ widgetsHere as $ module ) {
215216 $ this ->output ('<div class="qa-widget- ' . $ region . ' qa-widget- ' . $ region . '- ' . $ place . '"> ' );
216217 $ module ->output_widget ($ region , $ place , $ this , $ this ->template , $ this ->request , $ this ->content );
217218 $ this ->output ('</div> ' );
@@ -629,8 +630,10 @@ public function nav_item($key, $navlink, $class, $level = null)
629630 (@$ navlink ['state ' ] ? (' qa- ' . $ class . '- ' . $ navlink ['state ' ]) : '' ) . ' qa- ' . $ class . '- ' . $ suffix . '"> ' );
630631 $ this ->nav_link ($ navlink , $ class );
631632
632- if (count (@$ navlink ['subnav ' ]))
633- $ this ->nav_list ($ navlink ['subnav ' ], $ class , 1 + $ level );
633+ $ subnav = isset ($ navlink ['subnav ' ]) ? $ navlink ['subnav ' ] : array ();
634+ if (is_array ($ subnav ) && count ($ subnav ) > 0 ) {
635+ $ this ->nav_list ($ subnav , $ class , 1 + $ level );
636+ }
634637
635638 $ this ->output ('</li> ' );
636639 }
0 commit comments