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 -r1.1.8.2 -r1.1.8.3
--- openacs-4/packages/file-storage/www/view/index.vuh	18 Dec 2005 11:16:15 -0000	1.1.8.2
+++ openacs-4/packages/file-storage/www/view/index.vuh	16 Mar 2006 17:36:24 -0000	1.1.8.3
@@ -29,7 +29,7 @@
 # as though it's been passed by reference.   This requires that the redirect treat the
 # path as an absolute path within the filesystem.
 
-if {[parameter::get -parameter BehaveLikeFilesystemP -default 0]} {
+if {[parameter::get -parameter BehaveLikeFilesystemP -default 0] || [catch {set init_p [content::init the_url the_root $content_root $template_root public $revision_id $content_type]}] || !$init_p } {
     
     # Make sure we are not dealing with an upgraded file and there exists a file with the title
     if { [string equal "" $file_id] } {
@@ -69,18 +69,7 @@
 
 } else {
     
-    if { [content::init the_url the_root $content_root $template_root public $revision_id $content_type] } {
+    set file "$the_root/$the_url"
+    rp_internal_redirect -absolute_path $file
 
-	set file "$the_root/$the_url"
-	rp_internal_redirect -absolute_path $file
-    } else {
-	# ns_returnnotfound
-	set page "[ad_header {Content Item Not Found}]"
-	append page "<h3>Content Item Not Found</h3>"
-	append page "The requested item is not available for viewing.  "
-	append page "The item is either not available on this server or it is not in a publishable state  "
-	append page "Unpublished items can be viewed via the CMS interface if the CMS package is installed.<br>"
-	append page "[ad_footer]"
-	doc_return 404 text/html $page
-    }
 }