Index: pageroute.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pageroute/pageroute.module,v
retrieving revision 1.71.2.10
diff -u -r1.71.2.10 pageroute.module
--- pageroute.module	25 Aug 2009 10:06:58 -0000	1.71.2.10
+++ pageroute.module	26 Aug 2009 12:53:08 -0000
@@ -20,8 +20,6 @@
 define('PAGEROUTE_MENU_TABS', 2);
 define('PAGEROUTE_HINT_TABS', 3);
 
-include_once(drupal_get_path('module', 'pageroute') .'/pageroute.route.inc');
-include_once(drupal_get_path('module', 'pageroute') .'/pageroute.page.inc');
 
 /**
  * Implementation of hook_menu().
@@ -56,6 +54,7 @@
           'access callback' =>  'pageroute_access',
           'access arguments' => array((string)$route_data->prid),
           'type' => MENU_LOCAL_TASK,
+          'file' => 'pageroute.route.inc',
           'weight' => $page->weight
         );
       }
@@ -177,6 +176,7 @@
 
   $page = PageroutePage::getObject($page_data, $page_data->module);
   // loads the page variable with a page object
+  $form_state['page'] = $page;
   $route->getForm($form, $page_data, $page, $form_state, $args);
 
   if (!isset($args['hide_pageroute_buttons'])) {
@@ -356,7 +356,7 @@
  */
 function pageroute_access($prid) {
   global $user;
-
+  include_once(drupal_get_path('module', 'pageroute') .'/pageroute.route.inc');
   $route = PagerouteRoute::load($prid);
 
   return isset($route->options['access']['allowed_roles']) && array_intersect(array_keys($user->roles), $route->options['access']['allowed_roles']) ? TRUE : FALSE;
Index: pageroute_ui.forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pageroute/pageroute_ui.forms.inc,v
retrieving revision 1.1.2.7
diff -u -r1.1.2.7 pageroute_ui.forms.inc
--- pageroute_ui.forms.inc	5 Aug 2009 14:36:32 -0000	1.1.2.7
+++ pageroute_ui.forms.inc	26 Aug 2009 12:53:08 -0000
@@ -6,6 +6,8 @@
  * Adminstration forms, included from pageroute_ui.module
  */
 
+include_once(drupal_get_path('module', 'pageroute') .'/pageroute.route.inc');
+
 function pageroute_ui_route_edit(&$form_state, $op = 'add', $prid = NULL) {
   if ($op != 'add' && isset($prid) && is_numeric($prid)) {
     $route = db_fetch_object(db_query("SELECT * FROM {pageroute_routes} WHERE prid = %d", $prid));