=== modified file 'uc_reports/uc_reports.admin.inc'
--- uc_reports/uc_reports.admin.inc	2010-08-24 19:35:35 +0000
+++ uc_reports/uc_reports.admin.inc	2010-12-13 22:20:34 +0000
@@ -43,9 +43,10 @@
   $address_preference = variable_get('uc_customer_list_address', 'billing');
   $first_name = ($address_preference == 'billing') ? 'billing_first_name' : 'delivery_first_name';
   $last_name = ($address_preference == 'billing') ? 'billing_last_name' : 'delivery_last_name';
-  $page = (!is_null($_GET['page'])) ? intval($_GET['page']) : 0;
-  $page_size = (!is_null($_GET['nopage'])) ? UC_REPORTS_MAX_RECORDS : variable_get('uc_reports_table_size', 30);
+  $page = (isset($_GET['page'])) ? intval($_GET['page']) : 0;
+  $page_size = (isset($_GET['nopage'])) ? UC_REPORTS_MAX_RECORDS : variable_get('uc_reports_table_size', 30);
   $order_statuses = _uc_reports_order_statuses();
+  $rows =array();
   $csv_rows = array();
 
   $header = array(
@@ -133,7 +134,7 @@
     '#markup' => l(t('Export to CSV file.'), 'admin/store/reports/getcsv/' . $csv_data['report'] . '/' . $csv_data['user']),
     '#suffix' => '   ',
   );
-  if (!is_null($_GET['nopage'])) {
+  if (isset($_GET['nopage'])) {
     $build['links']['toggle_pager'] = array(
       '#markup' => l(t('Show paged records'), 'admin/store/reports/customers'),
     );
@@ -160,8 +161,8 @@
     $views_column = FALSE;
   }
 
-  $page = (!is_null($_GET['page'])) ? intval($_GET['page']) : 0;
-  $page_size = (!is_null($_GET['nopage'])) ? UC_REPORTS_MAX_RECORDS : variable_get('uc_reports_table_size', 30);
+  $page = (isset($_GET['page'])) ? intval($_GET['page']) : 0;
+  $page_size = (isset($_GET['nopage'])) ? UC_REPORTS_MAX_RECORDS : variable_get('uc_reports_table_size', 30);
   $order_statuses = _uc_reports_order_statuses();
   $row_cell = $page * variable_get('uc_reports_table_size', 30) + 1;
   $csv_rows = array();
@@ -307,7 +308,7 @@
     '#markup' => l(t('Export to CSV file.'), 'admin/store/reports/getcsv/' . $csv_data['report'] . '/' . $csv_data['user']),
     '#suffix' => '   ',
   );
-  if (!is_null($_GET['nopage'])) {
+  if (isset($_GET['nopage'])) {
     $build['links']['toggle_pager'] = array(
       '#markup' => l(t('Show paged records'), 'admin/store/reports/products'),
     );

=== modified file 'uc_reports/uc_reports.module'
--- uc_reports/uc_reports.module	2010-10-07 18:32:21 +0000
+++ uc_reports/uc_reports.module	2010-12-13 21:58:31 +0000
@@ -221,6 +221,7 @@
  */
 function uc_reports_store_csv($report_id, $rows) {
   global $user;
+  $csv_output = '';
   $user_id = (empty($user->uid)) ? session_id() : $user->uid;
   foreach ($rows as $row) {
     foreach ($row as $index => $column) {

=== modified file 'uc_stock/uc_stock.admin.inc'
--- uc_stock/uc_stock.admin.inc	2010-10-05 14:32:03 +0000
+++ uc_stock/uc_stock.admin.inc	2010-12-13 22:22:55 +0000
@@ -84,7 +84,7 @@
     $query->where('threshold >= stock');
   }
 
-  $result = pager_query($sql . tablesort_sql($header), $page_size, 0, NULL);
+  $result = $query->execute();
   foreach ($result as $stock) {
     $op = array();
     if (user_access('administer products')) {
@@ -129,7 +129,7 @@
     '#suffix' => '   ',
   );
 
-  if (!is_null($_GET['nopage'])) {
+  if (isset($_GET['nopage'])) {
     $build['links']['toggle_pager'] = array(
       '#markup' => l(t('Show paged records'), 'admin/store/reports/stock'),
     );

=== modified file 'uc_store/uc_store.admin.inc'
--- uc_store/uc_store.admin.inc	2010-12-09 18:09:39 +0000
+++ uc_store/uc_store.admin.inc	2010-12-13 21:53:32 +0000
@@ -33,12 +33,7 @@
         $item['description'] = $item['localized_options']['attributes']['title'];
       }
       $block = $item;
-      $block['content'] = '';
-      if ($item['block_callback'] && function_exists($item['block_callback'])) {
-        $function = $item['block_callback'];
-        $block['content'] .= $function();
-      }
-      $block['content'] .= theme('admin_block_content', array('content' => system_admin_menu_block($item)));
+      $block['content'] = theme('admin_block_content', array('content' => system_admin_menu_block($item)));
       if (!empty($block['content'])) {
         $block['show'] = TRUE;
       }