fix for "Variable "%num_active_cust_pkg" will not stay shared" error

diff --git a/Makefile b/Makefile
index ce682ef..b26718b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,15 +6,16 @@ DATASOURCE = DBI:Pg:dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-TEMPLATE = asp
-#TEMPLATE = mason
+#TEMPLATE = asp
+TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 MASON_HANDLER = /usr/local/etc/freeside/handler.pl
 MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb, others?
-FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+FREESIDE_DOCUMENT_ROOT = /var/www/masonside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 
@@ -58,8 +59,8 @@ SELFSERVICE_MACHINE = localhost
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.1rc5
-TAG=freeside_1_4_1rc5
+VERSION=1.4.1rc6
+TAG=freeside_1_4_1rc6
 
 help:
        @echo "supported targets: aspdocs masondocs alldocs docs install-docs"

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 976787a..3e37b7e 100644 (file)
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -38,7 +38,7 @@ use strict;
 my $ah = new HTML::Mason::ApacheHandler (
   #interp => $interp,
   #auto_send_headers => 0,
-  comp_root=>'/var/www/freeside',
+  comp_root=>'/var/www/masonside',
   data_dir=>'/usr/local/etc/freeside/masondata',
   #out_mode=>'stream',
 );

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 7b9436c..4b9197e 100755 (executable)
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -24,7 +24,9 @@ if ( $cgi->param('active') ) {
     $num_active_cust_pkg{$part_pkg->pkgpart} =
       $active_sth->fetchrow_arrayref->[0];
   }
-  $sortby = \*active_cust_pkg_sort;
+  $sortby = sub {
+    $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
+  };
 } else {
   $sortby = \*pkgpart_sort;
 }
@@ -137,8 +139,4 @@ sub pkgpart_sort {
   $a->pkgpart <=> $b->pkgpart;
 }
 
-sub active_cust_pkg_sort {
-  $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
-}
-
 %>