Merge branch 'MDL-60441_master' of git://github.com/juancs/moodle

mod/glossary/lang/en/glossary.php

@@ -151,6 +151,7 @@ $string['entrydeleted'] = 'Entry deleted';
 $string['entryexported'] = 'Entry successfully exported';
 $string['entryishidden'] = '(this entry is currently hidden)';
 $string['entryleveldefaultsettings'] = 'Entry level default settings';
+$string['entrylink'] = 'Entry link: {$a}';
 $string['entrysaved'] = 'This entry has been saved';
 $string['entryupdated'] = 'This entry has been updated';
 $string['entryusedynalink'] = 'This entry should be automatically linked';

mod/glossary/lib.php

@@ -1226,11 +1226,10 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
 
     $context = context_module::instance($cm->id);
 
-    $output = false;   //To decide if we must really return text in "return". Activate when needed only!
+    $output = false;   // To decide if we must really return text in "return". Activate when needed only!
     $importedentry = ($entry->sourceglossaryid == $glossary->id);
     $ismainglossary = $glossary->mainglossary;
 
-
     $return = '<span class="commands">';
     // Differentiate links for each entry.
     $altsuffix = strip_tags(format_text($entry->concept));
@@ -1241,6 +1240,11 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
             array('class' => 'glossary-hidden-note'));
     }
 
+    // Entry link.
+    $return .= '<a class="icon" title="' . get_string('entrylink', 'glossary', $altsuffix) . '" ' .
+               ' href="showentry.php?eid=' . $entry->id . '">' .
+               $OUTPUT->pix_icon('e/insert_edit_link', get_string('entrylink', 'glossary', $altsuffix)) . '</a>';
+
     if (has_capability('mod/glossary:approve', $context) && !$glossary->defaultapproval && $entry->approved) {
         $output = true;
         $return .= '<a class="icon" title="' . get_string('disapprove', 'glossary').