MDL-14591: fixing merge issues in portfolio

This commit is contained in:
mjollnir_ 2008-07-25 08:31:59 +00:00
parent d255c6e9ad
commit d6d24b8884
2 changed files with 2 additions and 1 deletions

View File

@ -83,7 +83,7 @@ if ($display) {
foreach ($instances as $i) {
$visible = $i->get_user_config('visible', $USER->id);
$table->data[] = array($i->get('name'), $i->get('plugin'),
($i->has_user_config())
($i->has_user_config()
? '<a href="' . $baseurl . '?config=' . $i->get('id') . '"><img src="' . $CFG->pixpath . '/t/edit.gif" alt="' . get_string('configure') . '" /></a>' : '') .
' <a href="' . $baseurl . '?hide=' . $i->get('id') . '"><img src="' . $CFG->pixpath . '/t/' . (($visible) ? 'hide' : 'show') . '.gif" alt="' . get_string($visible ? 'hide' : 'show') . '" /></a><br />'
);

View File

@ -245,6 +245,7 @@
// @todo permissions check?
$toprow[] = new tabobject('portfolios', $CFG->wwwroot .'/user/portfolio.php', get_string('portfolios', 'portfolio'));
}
}
///added a new messaging tab
if (has_capability('moodle/user:editownmessageprofile', $systemcontext)) {