[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface lonprintout.pm

raeburn raeburn@source.lon-capa.org
Thu, 10 Sep 2009 23:36:03 -0000


raeburn		Thu Sep 10 23:36:03 2009 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - Backport only first change from several changes in rev 1.569.
   - get_annotation() was moved from admannotations.pm to loncommon.pm in September 2008.
   - "use Apache::admannotations" no longer needed.  
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.545.2.4 loncom/interface/lonprintout.pm:1.545.2.5
--- loncom/interface/lonprintout.pm:1.545.2.4	Sat Mar 21 04:44:39 2009
+++ loncom/interface/lonprintout.pm	Thu Sep 10 23:36:03 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.545.2.4 2009/03/21 04:44:39 raeburn Exp $
+# $Id: lonprintout.pm,v 1.545.2.5 2009/09/10 23:36:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,6 @@
 use Apache::edit;
 use Apache::File();
 use Apache::lonnavmaps;
-use Apache::admannotations;
 use Apache::lonenc;
 use Apache::entities;
 
@@ -97,8 +96,7 @@
 sub annotate {
     my ($symb) = @_;
 
-    my $annotation_text = &Apache::admannotations::get_annotation($symb, 1);
-
+    my $annotation_text = &Apache::loncommon::get_annotation($symb, 1);
 
     my $result = "";