Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 03:30:36 +0000 (16:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 03:30:36 +0000 (16:30 +1300)
1  2 
course/dnduploadlib.php
course/format/renderer.php
course/view.php
course/yui/modchooser/modchooser.js
theme/base/style/core.css

@@@ -679,9 -674,9 +680,10 @@@ class dndupload_ajax_processor 
          $resp->name = $mod->name;
          $resp->link = $mod->get_url()->out();
          $resp->elementid = 'module-'.$mod->id;
-         $resp->commands = make_editing_buttons($mod, true, true, 0, $mod->sectionnum);
+         $actions = course_get_cm_edit_actions($mod, 0, $mod->sectionnum);
+         $resp->commands = ' '. $courserenderer->course_section_cm_edit_actions($actions);
          $resp->onclick = $mod->get_on_click();
 +        $resp->visible = $mod->visible;
  
          // if using groupings, then display grouping name
          if (!empty($mod->groupingid) && has_capability('moodle/course:managegroups', $this->context)) {
Simple merge
diff --cc course/view.php
Simple merge
Simple merge
Simple merge