web/include widgets.inc,1.13,1.14

Patrick Barnes (nman64) fedora-extras-commits at redhat.com
Wed Dec 7 01:58:22 UTC 2005


Author: nman64

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv885

Modified Files:
	widgets.inc 
Log Message:
Debugging


Index: widgets.inc
===================================================================
RCS file: /cvs/fedora/web/include/widgets.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- widgets.inc	7 Dec 2005 00:13:04 -0000	1.13
+++ widgets.inc	7 Dec 2005 01:58:20 -0000	1.14
@@ -75,7 +75,7 @@
 /* iterate through the sitelist recursively */
 function side_nav_traverse($node,$page_level,$current_level="0",$nav_id="",$options="") {
 
-	if (!isset($node) || !is_array($node)) {
+	if (!isset($node) || !is_array($node) || empty($node)) {
 		var_dump(debug_backtrace());
 		return;
 	}
@@ -89,7 +89,7 @@
 
 	$output.="\t<ul$id>";
 
-	while (list(, $item) = each($node)) {
+	foreach($node as $item) {
 
 		// Display item as selected if it is the correct or intended URI
 		if ($item['uri'] == $page_level['complete_path'] || $item['uri'] == $options['selected_uri']) {
@@ -110,6 +110,8 @@
 			$output.=side_nav_traverse($item['sub'],$page_level,$current_level+1,$nav_id,$options);
 		}
 		$output.='</li>';
+
+		next($node);
 	}
 	$output.="\n".str_repeat("\t",$current_level+3).'</ul>';
 




More information about the scm-commits mailing list