[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/Handler Page.pm,1.10,1.11

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv14695/OpenInteract/Handler

Modified Files:
	Page.pm 
Log Message:
updated to respect the alias if it exists


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler/Page.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Page.pm	2001/10/30 02:25:08	1.10
--- Page.pm	2001/11/26 06:26:42	1.11
***************
*** 129,135 ****
      # See if the upload should be there
  
-     # TODO: Modify the save() methods in OI::Page::Blah to take a
-     # filehandle in 'content' as well as plain old text.
- 
      my $has_upload = $class->_read_field_toggled( $R->apache, 'use_upload' );
      if ( $has_upload eq 'yes' ) {
--- 129,132 ----
***************
*** 247,251 ****
      }
  
!     # We have a page and we can display it, so grab the content
  
      $page->content;
--- 244,258 ----
      }
  
!     # We have a page and we can display it, so deal with the fact that
!     # it may be an alias and then grab the relevant content
! 
!     while ( $page->{storage} eq 'alias' ) {
!         $page = eval { $class->_find_page_object( $page->{content_location} ) };
!         if ( $@ or ! $page ) {
!             $R->scrib( 0, "Location for alias ($page->{content_location})",
!                           "wasn't found. ($@)" );
!             return "Request was for an alias, but aliased page unavailable.";
!         }
!     }
  
      $page->content;