Index: panels_export/panels_export.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_export/Attic/panels_export.module,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 panels_export.module
--- panels_export/panels_export.module	27 May 2008 20:21:14 -0000	1.1.2.3
+++ panels_export/panels_export.module	5 Jun 2008 22:16:09 -0000
@@ -13,8 +13,8 @@
  * Implementation of hook_menu().
  */
 function panels_export_menu($may_cache) {
+  $items = array();
   if ($may_cache) {
-    $items = array();
     $items[] = array(
       'path' => 'admin/panels/export',
       'title' => t('Export panels'),
@@ -28,8 +28,8 @@ function panels_export_menu($may_cache) 
       'callback' => 'panels_export_export',
       'type' => MENU_CALLBACK,
     );
-    return $items;
   }
+  return $items;
 }
 
 /**
Index: panels_mini/panels_mini.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_mini/Attic/panels_mini.module,v
retrieving revision 1.1.2.29
diff -u -p -r1.1.2.29 panels_mini.module
--- panels_mini/panels_mini.module	5 Jun 2008 03:46:22 -0000	1.1.2.29
+++ panels_mini/panels_mini.module	5 Jun 2008 22:16:21 -0000
@@ -41,6 +41,7 @@ function panels_mini_perm() {
  * Implementation of hook_menu().
  */
 function panels_mini_menu($may_cache) {
+  $items = array();
   if ($may_cache) {
     $access = user_access('create mini panels');
 
@@ -96,10 +97,9 @@ function panels_mini_menu($may_cache) {
     );
   }
   else {
-    if (arg(0) == 'admin' && arg(1) == 'panels' && arg(2) == 'panel-mini') {
+    if (arg(0) == 'admin' && arg(1) == 'panels' && arg(2) == 'panel-mini' && arg(3)) {
       $mini = panels_mini_load(arg(3));
       if ($mini && empty($mini->disabled)) {
-        $items = array();
         panels_mini_menu_items($items, "admin/panels/panel-mini/$mini->name", $mini);
       }
     }
Index: panels_node/panels_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_node/Attic/panels_node.module,v
retrieving revision 1.1.2.18
diff -u -p -r1.1.2.18 panels_node.module
--- panels_node/panels_node.module	27 May 2008 20:21:14 -0000	1.1.2.18
+++ panels_node/panels_node.module	5 Jun 2008 22:16:46 -0000
@@ -24,17 +24,19 @@ function panels_node_perm() {
  * Implementation of hook_menu().
  */
 function panels_node_menu($may_cache) {
+  $items = array();
+  $access = user_access('create panel-nodes');
   if ($may_cache) {
     $items[] = array(
       'path' => 'node/add/panel',
       'title' => t('Panel'),
-      'access' => user_access('create panel-nodes'),
+      'access' => $access,
       'type' => MENU_NORMAL_ITEM,
     );
     $items[] = array(
       'path' => 'admin/panels/panel-nodes',
       'title' => t('Panel nodes'),
-      'access' => user_access('create panel-nodes') && user_access('access administration pages'),
+      'access' => $access && user_access('access administration pages'),
       'type' => MENU_NORMAL_ITEM,
       'callback' => 'panels_node_admin',
       'description' => t('Information about panel nodes.'),
@@ -43,7 +45,7 @@ function panels_node_menu($may_cache) {
     $items[] = array(
       'path' => 'admin/panels/panel-nodes/information',
       'title' => t('Information'),
-      'access' => user_access('create panel-nodes') && user_access('access administration pages'),
+      'access' => $access && user_access('access administration pages'),
       'type' => MENU_DEFAULT_LOCAL_TASK,
     );
 
@@ -93,7 +95,7 @@ function panels_node_menu($may_cache) {
       }
     }
     // Hard override of node/add
-    if (arg(0) == 'node' && arg(1) == 'add' && arg(2) == 'panel' && arg(3) == NULL) {
+    elseif (arg(0) == 'node' && arg(1) == 'add' && arg(2) == 'panel' && arg(3) == NULL) {
       $items[] = array(
         'path' => 'node/add/panel',
         'title' => t('Panel'),
Index: panels_simple_cache/panels_simple_cache.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_simple_cache/Attic/panels_simple_cache.module,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 panels_simple_cache.module
--- panels_simple_cache/panels_simple_cache.module	4 Jun 2008 12:55:15 -0000	1.1.2.7
+++ panels_simple_cache/panels_simple_cache.module	5 Jun 2008 22:17:12 -0000
@@ -12,6 +12,7 @@
  * Implementation of hook_menu().
  */
 function panels_simple_cache_menu($may_cache) {
+  $items = array();
   if ($may_cache) {
     $items[] = array(
       'path' => 'admin/panels/simple-cache',
@@ -21,8 +22,8 @@ function panels_simple_cache_menu($may_c
       'callback' => 'panels_simple_cache_admin',
       'description' => t('Information about Panels simple cache.'),
     );
-    return $items;
   }
+  return $items;
 }
 
 /**
Index: panels_views/panels_views.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_views/Attic/panels_views.module,v
retrieving revision 1.1.2.24
diff -u -p -r1.1.2.24 panels_views.module
--- panels_views/panels_views.module	5 Jun 2008 03:46:21 -0000	1.1.2.24
+++ panels_views/panels_views.module	5 Jun 2008 22:17:23 -0000
@@ -14,6 +14,7 @@
  * Implementation of hook_menu().
  */
 function panels_views_menu($may_cache) {
+  $items = array();
   $access = user_access('administer panel views');
   if ($may_cache) {
     $items[] = array(
@@ -83,8 +84,8 @@ function panels_views_menu($may_cache) {
       'weight' => -1,
       'type' => MENU_CALLBACK,
     );
-    return $items;
   }
+  return $items;
 }
 
 /**