Index: openacs-4/packages/file-storage/www/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/view/index.vuh,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/file-storage/www/view/index.vuh	1 Mar 2007 11:59:11 -0000	1.5
+++ openacs-4/packages/file-storage/www/view/index.vuh	12 Dec 2008 17:39:50 -0000	1.5.2.1
@@ -23,6 +23,8 @@
                    -root_folder_id $content_root \
                    -resolve_index "f"]
 
+set user_id [ad_conn user_id]
+	
 # Serve the page
 
 # DRB: Note that content::init modifies the local variable the_root, which is treated
@@ -61,19 +63,25 @@
 	    set version_id [item::get_live_revision $file_id]
 	}
 
-	set user_id [ad_conn user_id]
-	
 	if {[apm_package_installed_p views]} {
-	    set user_id [ad_conn user_id]
 	    views::record_view -object_id $file_id -viewer_id $user_id
 	}
 
-	ad_require_permission $version_id "read"
+    permission::require_permission \
+        -party_id $user_id \
+        -object_id $version_id \
+        -privilege read
 	cr_write_content -revision_id $version_id
     }
 
 } else {
     
+    set version_id [item::get_live_revision $file_id]
+    permission::require_permission \
+        -party_id $user_id \
+        -object_id $version_id \
+        -privilege read
+
     set file "$the_root/$the_url"
     rp_internal_redirect -absolute_path $file