MDL-14591: fixing merge issues in portfolio

diff --git a/user/portfolio.php b/user/portfolio.php
index 934427a..16d0e29 100644 (file)
--- a/user/portfolio.php
+++ b/user/portfolio.php
@@ -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 />'
         );

diff --git a/user/tabs.php b/user/tabs.php
index 815d909..9d40591 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -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)) {