Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle

This commit is contained in:
David Monllao 2015-11-23 13:56:06 +08:00
commit 6f77b910ee

View File

@ -788,7 +788,7 @@ class assign_files implements renderable {
if (!empty($CFG->enableportfolios)) {
require_once($CFG->libdir . '/portfoliolib.php');
if (count($files) >= 1 &&
if (count($files) >= 1 && !empty($sid) &&
has_capability('mod/assign:exportownsubmission', $this->context)) {
$button = new portfolio_add_button();
$callbackparams = array('cmid' => $this->cm->id,
@ -823,6 +823,7 @@ class assign_files implements renderable {
foreach ($dir['files'] as $file) {
$file->portfoliobutton = '';
if (!empty($CFG->enableportfolios)) {
require_once($CFG->libdir . '/portfoliolib.php');
$button = new portfolio_add_button();
if (has_capability('mod/assign:exportownsubmission', $this->context)) {
$portfolioparams = array('cmid' => $this->cm->id, 'fileid' => $file->get_id());