Index: includes/plugins.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/includes/plugins.inc,v
retrieving revision 1.8
diff -u -r1.8 plugins.inc
--- includes/plugins.inc	23 Aug 2008 00:57:55 -0000	1.8
+++ includes/plugins.inc	26 Aug 2008 13:39:57 -0000
@@ -852,13 +852,15 @@
  */
 function panels_argument_get_display($arguments, $contexts) {
   $display_candidate = NULL;
-  foreach ($arguments as $i => $argument) {
-    $id = panels_argument_context_id($argument);
-    if (!empty($contexts[$id]) && !empty($contexts[$id]->data)) {
-      $context = $contexts[$id];
-      $d = panels_argument_choose_display($argument['name'], $argument['argument_settings'], $context);
-      if ($d) {
-        $display_candidate = "argument_$i" . '-' . $d;
+  if (!empty($arguments)) {
+    foreach ($arguments as $i => $argument) {
+      $id = panels_argument_context_id($argument);
+      if (!empty($contexts[$id]) && !empty($contexts[$id]->data)) {
+        $context = $contexts[$id];
+        $d = panels_argument_choose_display($argument['name'], $argument['argument_settings'], $context);
+        if ($d) {
+          $display_candidate = "argument_$i" . '-' . $d;
+        }
       }
     }
   }
Index: panels_page/panels_page.menu.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_page/panels_page.menu.inc,v
retrieving revision 1.20
diff -u -r1.20 panels_page.menu.inc
--- panels_page/panels_page.menu.inc	22 Aug 2008 22:37:18 -0000	1.20
+++ panels_page/panels_page.menu.inc	26 Aug 2008 10:37:31 -0000
@@ -179,7 +179,7 @@
     if (!empty($panels_items['metadata'][$raw_path])) {
       $metadata = &$panels_items['metadata'][$raw_path];
       $metadata->loader_flags |= isset($matches[$path]) ? PANELS_HAS_FALLBACK_ROUTER : 0;
-      db_query('UPDATE {panels_page} SET loader_flags = %d WHERE pid = %d', $metadata->loader_flags, $metadata->pid);
+      db_query('UPDATE {panels_page} SET flags = %d WHERE pid = %d', $metadata->loader_flags, $metadata->pid);
     }
   }
   // Re-call our helper function and store updated items into the static cache.
@@ -340,6 +340,7 @@
  */
 function _panels_page_menu_router_build($callbacks, $matches) {
   $menu = array();
+  $sort = array();
   foreach ($matches as $path => $match) {
     $item = $callbacks[$path];
     $load_functions = array();
Index: panels_page/panels_page.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_page/panels_page.module,v
retrieving revision 1.33
diff -u -r1.33 panels_page.module
--- panels_page/panels_page.module	25 Aug 2008 04:12:28 -0000	1.33
+++ panels_page/panels_page.module	26 Aug 2008 13:37:19 -0000
@@ -145,8 +145,7 @@
  */
 function panels_page_access_handler() {
   $args = func_get_args();
-  // Get the pid, which is passed in with a prepended string.
-  $pid = substr(array_shift($args), 4);
+  $pid = array_shift($args);
   $loader_data = panels_page_get_loader_data($pid, $args);
   return $loader_data['access'];
 }
@@ -163,9 +162,7 @@
  */
 function panels_page_render_handler() {
   $args = func_get_args();
-  // Get the pid, which is passed in with a prepended string.
-  // TODO switch to name...
-  $pid = substr(array_shift($args), 4);
+  $pid = array_shift($args);
   $loader_data = panels_page_get_loader_data($pid, $args);

   return call_user_func_array($loader_data['page callback'], $loader_data['page arguments']);
@@ -173,16 +170,14 @@

 function panels_page_static_render_handler() {
   $args = func_get_args();
-  // Get the pid, which is passed in with a prepended string.
-  $pid = substr(array_shift($args), 4);
+  $pid = array_shift($args);
   $loader_data = panels_page_get_loader_data($pid, $args);
-  return panels_page_render_page_normal($loader_data['panel_page']);
+  return panels_page_render_page_normal($loader_data['panel_page'], $args);
 }

 function panels_page_title_handler() {
   $args = func_get_args();
-  // Get the pid, which is passed in with a prepended string.
-  $pid = substr(array_shift($args), 4);
+  $pid = array_shift($args);
   $loader_data = panels_page_get_loader_data($pid, $args);
   if ($loader_data['fallback'] === TRUE) {
     return _menu_item_localize($loader_data['router item'], $loader_data['map']);