Index: openacs-4/packages/photo-album/tcl/photo-album-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/photo-album/tcl/photo-album-procs.tcl	13 Jun 2005 16:31:11 -0000	1.15
+++ openacs-4/packages/photo-album/tcl/photo-album-procs.tcl	15 Jun 2005 18:07:41 -0000	1.16
@@ -1259,34 +1259,3 @@
 
     return [site_node::get_element -node_id $node_id -element url]
 }
-
-
-namespace eval photo_album::merge {
-    ad_proc -callback MergeShowUserInfo -impl photo_album {
-	-user_id:required
-    } {
-	Show the items of user_id
-    } {
-	set result [list "photo_album items of $user_id"]
-	set user_items [db_list_of_lists sel_collections { *SQL* }]
-	lappend result $user_items
-	return $result
-    }
-
-    ad_proc -callback MergePackageUser -impl photo_album {
-	-from_user_id:required
-	-to_user_id:required
-    } {
-	Merge the photo_album items of two users.
-    } {
-	set msg "Merging photo album"
-	set result [list $msg]
-	ns_log Notice $msg
-	
-	db_transaction {
-	    db_dml upd_collections { *SQL* }
-	    lappend result "Photo album merge is done"
-	} 
-	return $result
-    }
-}
Index: openacs-4/packages/photo-album/tcl/photo-album-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-procs.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/tcl/photo-album-procs.xql	13 Jun 2005 16:31:11 -0000	1.5
+++ openacs-4/packages/photo-album/tcl/photo-album-procs.xql	15 Jun 2005 18:07:41 -0000	1.6
@@ -50,20 +50,4 @@
      </querytext>
 </fullquery>
 
-<fullquery name="callback::MergePackageUser::impl::photo_album.upd_collections">      
-    <querytext>
-      update pa_collections
-      set owner_id = :to_user_id
-      where owner_id = :from_user_id
-    </querytext>
-</fullquery>
-
-<fullquery name="callback::MergeShowUserInfo::impl::photo_album.sel_collections">      
-    <querytext>
-      select collection_id, title
-      from pa_collections
-      where owner_id = :user_id
-    </querytext>
-</fullquery>
-
 </queryset>