--- loncom/interface/lonaboutme.pm	2008/12/10 21:46:58	1.82
+++ loncom/interface/lonaboutme.pm	2008/12/15 15:46:35	1.84
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.82 2008/12/10 21:46:58 kaisler Exp $
+# $Id: lonaboutme.pm,v 1.84 2008/12/15 15:46:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -293,15 +293,13 @@ my $image;
        }
        if ($allowed) {
            $r->print(
-	 '<form method="post">
-               <input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />
-          </form>'.
 	 '<form method="post" enctype="multipart/form-data">'.
          '<h3>'.&mt('Upload a Photo').'</h3>'.
          '<input type="file" name="uploaddoc" size="50" />'.
          '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
          '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
-	 '</form><form method="post">');
+	 '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>
+');
 
        }
 	&Apache::lontemplate::start_columnSection($r);
@@ -782,7 +780,8 @@ sub aboutme_access {
         $cdom = $coursehash{'domain'};
         $cnum = $coursehash{'cnum'};
     }
-    if ((&allowed('srm',$privcheck)) || (&allowed('dff',$privcheck))) {
+    if ((&Apache::lonnet::allowed('srm',$privcheck)) || 
+        (&Apache::lonnet::allowed('dff',$privcheck))) {
         if (&in_course($uname,$udom,$cnum,$cdom)) {
             return 1;
         }