Index: openacs-4/packages/cms/www/modules/types/widget-register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/types/widget-register.tcl	13 Apr 2005 20:15:19 -0000	1.6
+++ openacs-4/packages/cms/www/modules/types/widget-register.tcl	9 May 2005 23:27:04 -0000	1.7
@@ -5,9 +5,8 @@
 request set_param content_type -datatype keyword
 request set_param widget -datatype keyword -optional
 
-set module_id [db_string get_module_id ""]
 permission::require_permission -party_id [auth::require_login] \
-    -object_id $module_id -privilege write
+    -object_id [cm::modules::get_module_id -module_name types -package_id [ad_conn package_id]] -privilege write
 
 wizard set_param attribute_id $attribute_id
 wizard set_param content_type $content_type
Index: openacs-4/packages/cms/www/modules/types/widget-register.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/widget-register.xql	27 May 2001 04:39:19 -0000	1.2
+++ openacs-4/packages/cms/www/modules/types/widget-register.xql	9 May 2005 23:27:04 -0000	1.3
@@ -1,19 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="get_module_id">      
-      <querytext>
-      
-  select
-    module_id
-  from
-    cm_modules
-  where
-    key = 'types'
-
-      </querytext>
-</fullquery>
-
 <fullquery name="get_form_widgets">      
       <querytext>
 
Index: openacs-4/packages/cms/www/modules/types/widget-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-unregister.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/types/widget-unregister.tcl	13 Apr 2005 20:15:19 -0000	1.4
+++ openacs-4/packages/cms/www/modules/types/widget-unregister.tcl	9 May 2005 23:27:04 -0000	1.5
@@ -1,9 +1,8 @@
 request create
 request set_param attribute_id -datatype integer
 
-set module_id [db_string get_module_id ""]
 permission::require_permission -party_id [auth::require_login] \
-    -object_id $module_id -privilege write
+    -object_id [cm::modules::get_module_id -module_name types -package_id [ad_conn package_id]] -privilege write
 
 db_1row get_attr_info ""
 
Index: openacs-4/packages/cms/www/modules/types/widget-unregister.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-unregister.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-unregister.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/widget-unregister.xql	9 May 2005 23:27:04 -0000	1.2
@@ -1,20 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="get_module_id">      
-      <querytext>
-      
-  select
-    module_id
-  from
-    cm_modules
-  where
-    key = 'types'
-
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="get_attr_info">      
       <querytext>