? get.patch
? panels_node/.panels_node.module.swp
Index: panels.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels.module,v
retrieving revision 1.27.2.4
diff -u -p -r1.27.2.4 panels.module
--- panels.module	29 Oct 2008 21:48:53 -0000	1.27.2.4
+++ panels.module	5 Nov 2008 19:56:05 -0000
@@ -918,10 +918,11 @@ function theme_panels_layout_link($title
  * Print the layout link. Sends out to a theme function.
  * @layout
  */
-function panels_print_layout_link($id, $layout, $link) {
+function panels_print_layout_link($id, $layout, $link, $options) {
+  $options['html'] = TRUE;
   drupal_add_css(panels_get_path('css/panels_admin.css'));
   $file = $layout['path'] . '/' . $layout['icon'];
-  $image = l(theme('image', $file), $link, array('html' => true));
+  $image = l(theme('image', $file), $link, $options);
   $title = l($layout['title'], $link);
   return theme('panels_layout_link', $title, $id, $image, $link);
 }
Index: panels_node/panels_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_node/panels_node.module,v
retrieving revision 1.4.2.2
diff -u -p -r1.4.2.2 panels_node.module
--- panels_node/panels_node.module	23 Oct 2008 23:38:23 -0000	1.4.2.2
+++ panels_node/panels_node.module	5 Nov 2008 19:56:08 -0000
@@ -157,8 +157,11 @@ function panels_node_add() {
 
   panels_load_include('plugins');
   // If no layout selected, present a list of choices.
+  $get = $_GET;
+  unset($get['q']);
+  $options['query'] = $get;
   foreach (panels_get_layouts() as $id => $layout) {
-    $output .= panels_print_layout_link($id, $layout, 'node/add/panel/' . $id);
+    $output .= panels_print_layout_link($id, $layout, 'node/add/panel/' . $id, $options);
   }
   return $output;
 }
@@ -173,7 +176,10 @@ function panels_node_form(&$node, &$para
     // and if that doesn't work present them with a list to pick from.
     $panel_layout = isset($node->panel_layout) ? $node->panel_layout : arg(3);
     if (empty($panel_layout)) {
-      return drupal_goto('node/add/panel/choose-layout');
+     $get = $_GET;
+     unset($get['q']);
+
+      return drupal_goto('node/add/panel/choose-layout', $get);
     }
 
     panels_load_include('plugins');