[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Action.pm,1.58,1.59

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24028/lib/OpenInteract2

Modified Files:
	Action.pm 
Log Message:
OIN-95: fixed missing $self->param() lookup in message_from_key_or_param()
Fix docs typos


Index: Action.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Action.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Action.pm	31 Oct 2004 00:18:18 -0000	1.58
--- Action.pm	8 Nov 2004 14:40:17 -0000	1.59
***************
*** 899,905 ****
  sub message_from_key_or_param {
      my ( $self, $param_name, $message_key, @key_args ) = @_;
!     if ( $message_key ) {
          my $language_handle = CTX->request->language_handle;
!         my $msg = $language_handle->maketext( $message_key, @key_args );
          return $msg if ( $msg );
      }
--- 899,909 ----
  sub message_from_key_or_param {
      my ( $self, $param_name, $message_key, @key_args ) = @_;
!     $log ||= get_logger( LOG_ACTION );
!     if ( $message_key and $self->param($message_key) ) {
          my $language_handle = CTX->request->language_handle;
!         $log->is_debug
!           && $log->debug( "Creating message from '$message_key' field '".
!                           $self->param($message_key) ."' with args '@key_args'\n" );
!         my $msg = $language_handle->maketext( $self->param($message_key), @key_args );
          return $msg if ( $msg );
      }
***************
*** 2493,2497 ****
  Returns: nothing
  
! B<message_from_param_or_key( $param_name, $message_key, @key_arguments )>
  
  Shortcut for returning a message from either the localized message
--- 2497,2501 ----
  Returns: nothing
  
! B<message_from_key_or_param( $param_name, $message_key, @key_arguments )>
  
  Shortcut for returning a message from either the localized message
***************
*** 2505,2509 ****
  If you call:
  
!  my $msg = $myaction->message_from_param_or_key( 'title', 'title_key' );
  
  The C<$msg> variable should have whatever is in the localization table
--- 2509,2513 ----
  If you call:
  
!  my $msg = $myaction->message_from_key_or_param( 'title', 'title_key' );
  
  The C<$msg> variable should have whatever is in the localization table