Merge branch 'MDL-40759-master-fix1' of http://github.com/damyon/moodle

comment/comment.js

@@ -332,14 +332,15 @@ M.core_comment = {
                             }
                         }, '13,32');
                         // 13 and 32 are the keycodes for space and enter.
+
+                        require(['core/templates', 'core/notification'], function(Templates, Notification) {
+                            var title = node.getAttribute('title');
+                            Templates.renderPix('t/delete', 'core', title).then(function(html) {
+                                node.set('innerHTML', html);
+                            }).catch(Notification.exception);
+                        });
                     }
                 );
-
-                require(['core/templates', 'core/notification'], function(Templates, Notification) {
-                    Templates.renderPix('t/delete', 'core', M.util.get_string('deletecomment', 'moodle')).then(function(html) {
-                        Y.all('div.comment-delete a').set('innerHTML', html);
-                    }).catch(Notification.exception);
-                });
             },
             register_pagination: function() {
                 var scope = this;

comment/lib.php

@@ -263,8 +263,7 @@ class comment {
                 'comments',
                 'commentscount',
                 'commentsrequirelogin',
-                'deletecommentbyon',
-                'deletecomment',
+                'deletecommentbyon'
             ),
             'moodle'
         );
@@ -916,8 +915,11 @@ class comment {
         $replacements = array();
 
         if (!empty($cmt->delete) && empty($nonjs)) {
+            $strdelete = get_string('deletecommentbyon', 'moodle', (object)['user' => $cmt->fullname, 'time' => $cmt->time]);
             $deletelink  = html_writer::start_tag('div', array('class'=>'comment-delete'));
-            $deletelink .= html_writer::start_tag('a', array('href' => '#', 'id' => 'comment-delete-'.$this->cid.'-'.$cmt->id));
+            $deletelink .= html_writer::start_tag('a', array('href' => '#', 'id' => 'comment-delete-'.$this->cid.'-'.$cmt->id,
+                                                             'title' => $strdelete));
+
             $deletelink .= $OUTPUT->pix_icon('t/delete', get_string('delete'));
             $deletelink .= html_writer::end_tag('a');
             $deletelink .= html_writer::end_tag('div');

lang/en/cache.php

@@ -48,6 +48,7 @@ $string['cachedef_completion'] = 'Activity completion status';
 $string['cachedef_databasemeta'] = 'Database meta information';
 $string['cachedef_eventinvalidation'] = 'Event invalidation';
 $string['cachedef_externalbadges'] = 'External badges for particular user';
+$string['cachedef_fontawesomeiconmapping'] = 'Mapping of icons for font awesome';
 $string['cachedef_suspended_userids'] = 'List of suspended users per course';
 $string['cachedef_groupdata'] = 'Course group information';
 $string['cachedef_htmlpurifier'] = 'HTML Purifier - cleaned content';

lib/classes/output/icon_system_fontawesome.php

@@ -431,16 +431,23 @@ class icon_system_fontawesome extends icon_system_font {
      */
     public function get_icon_name_map() {
         if ($this->map === []) {
-            $this->map = $this->get_core_icon_map();
-            $callback = 'get_fontawesome_icon_map';
+            $cache = \cache::make('core', 'fontawesomeiconmapping');
 
-            if ($pluginsfunction = get_plugins_with_function($callback)) {
-                foreach ($pluginsfunction as $plugintype => $plugins) {
-                    foreach ($plugins as $pluginfunction) {
-                        $pluginmap = $pluginfunction();
-                        $this->map += $pluginmap;
+            $this->map = $cache->get('mapping');
+
+            if (empty($this->map)) {
+                $this->map = $this->get_core_icon_map();
+                $callback = 'get_fontawesome_icon_map';
+
+                if ($pluginsfunction = get_plugins_with_function($callback)) {
+                    foreach ($pluginsfunction as $plugintype => $plugins) {
+                        foreach ($plugins as $pluginfunction) {
+                            $pluginmap = $pluginfunction();
+                            $this->map += $pluginmap;
+                        }
                     }
                 }
+                $cache->set('mapping', $this->map);
             }
 
         }

lib/db/caches.php

@@ -309,4 +309,14 @@ $definitions = array(
         'simplevalues' => true,
         'datasource' => '\core_message\time_last_message_between_users',
     ),
+
+    // Caches font awesome icons.
+    'fontawesomeiconmapping' => array(
+        'mode' => cache_store::MODE_APPLICATION,
+        'simplekeys' => true,
+        'simpledata' => true,
+        'staticacceleration' => true,
+        'staticaccelerationsize' => 1
+    ),
+
 );