[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Wed Aug 28 14:02:43 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1150, 1.1151.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.48 loncom/interface/loncommon.pm:1.1075.2.49
--- loncom/interface/loncommon.pm:1.1075.2.48	Tue Aug 20 12:02:31 2013
+++ loncom/interface/loncommon.pm	Wed Aug 28 14:02:42 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.48 2013/08/20 12:02:31 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.49 2013/08/28 14:02:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8035,10 +8035,16 @@
 }
 
 sub simple_error_page {
-    my ($r,$title,$msg) = @_;
+    my ($r,$title,$msg,$args) = @_;
+    if (ref($args) eq 'HASH') {
+        if (!$args->{'no_auto_mt_msg'}) { $msg = &mt($msg); }
+    } else {
+        $msg = &mt($msg);
+    }
+
     my $page =
 	&Apache::loncommon::start_page($title).
-	'<p class="LC_error">'.&mt($msg).'</p>'.
+	'<p class="LC_error">'.$msg.'</p>'.
 	&Apache::loncommon::end_page();
     if (ref($r)) {
 	$r->print($page);