Follow up fix for MDL-11436 'Encapsulate "accesshide" HTML class in function', and...

diff --git a/calendar/lib.php b/calendar/lib.php
index 3292d70ec3886f7fa7b6c244097140cf1fbfb12f..7bb5d7d6feafd09b394bc31c8d8d87c1ea064234 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -321,7 +321,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
                 $popup = calendar_get_popup(true, false);
                 $cell = '<a href="#" '.$popup.'>'.$day.'</a>';
             }
-            $cell = '<span class="accesshide">'.$today.' </span>'.$cell;
+            $cell = get_accesshide($today.' ').$cell;
         }
 
         // Just display it

diff --git a/lib/tablelib.php b/lib/tablelib.php
index 6494965c429bdcb28532ff8d63b3e214cac09323..4fd85b7b58981b1dbc1a8b8f7369d2bf445680a3 100644 (file)
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -654,8 +654,8 @@ class flexible_table {
                         $fsortorder = get_string('asc');
                         $lsortorder = get_string('asc');
                     }
-                    $this->headers[$index] = '<a href="'.$this->baseurl.$this->request[TABLE_VAR_SORT].'=firstname">'.get_string('firstname').'<span class="accesshide">'.get_string('sortby').' '.get_string('firstname').' '.$fsortorder.'</span></a> '.$icon_sort_first.' / '.
-                                          '<a href="'.$this->baseurl.$this->request[TABLE_VAR_SORT].'=lastname">'.get_string('lastname').'<span class="accesshide">'.get_string('sortby').' '.get_string('lastname').' '.$lsortorder.'</span></a> '.$icon_sort_last;
+                    $this->headers[$index] = '<a href="'.$this->baseurl.$this->request[TABLE_VAR_SORT].'=firstname">'.get_string('firstname').get_accesshide(get_string('sortby').' '.get_string('firstname').' '.$fsortorder).'</a> '.$icon_sort_first.' / '.
+                                          '<a href="'.$this->baseurl.$this->request[TABLE_VAR_SORT].'=lastname">'.get_string('lastname').get_accesshide(get_string('sortby').' '.get_string('lastname').' '.$lsortorder).'</a> '.$icon_sort_last;
                 }
                 break;
 
@@ -677,7 +677,7 @@ class flexible_table {
                     } else {
                         $localsortorder = get_string('asc');  
                     }
-                    $this->headers[$index] = '<a href="'.$this->baseurl.$this->request[TABLE_VAR_SORT].'='.$column.'">'.$this->headers[$index].'<span class="accesshide">'.get_string('sortby').' '.$this->headers[$index].' '.$localsortorder.'</span></a>';
+                    $this->headers[$index] = '<a href="'.$this->baseurl.$this->request[TABLE_VAR_SORT].'='.$column.'">'.$this->headers[$index].get_accesshide(get_string('sortby').' '.$this->headers[$index].' '.$localsortorder).'</a>';
                 }
             }
 

diff --git a/lib/weblib.php b/lib/weblib.php
index 8d41b194bb497829ac7fff01aca633793b192aa9..209916bcc478c43fff24f046bfb2aa5acfe088a7 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3499,7 +3499,7 @@ function build_navigation($extranavlinks, $cm = null) {
 
     //Construct an unordered list from $navlinks
     //Accessibility: heading hidden from visual browsers by default.
-    $navigation = '<h2 class="accesshide">'.get_string('youarehere','access')."</h2> <ul>\n";
+    $navigation = get_accesshide(get_string('youarehere','access'), 'h2')." <ul>\n";
     $lastindex = count($navlinks) - 1;
     $i = -1; // Used to count the times, so we know when we get to the last item.
     $first = true;