From: Penny Leach <penny@mjollnir.org>
Date: Sun, 10 Jan 2010 21:32:10 +0000 (+0100)
Subject: stashing portfolio changes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=20f1561d075e4d9094b37834e65063af3e6fcc1f;p=moodle.git

stashing portfolio changes
---

diff --git a/portfolio/mahara/lib.php b/portfolio/mahara/lib.php
index f42b5e89c1..ef7fc02bc6 100644
--- a/portfolio/mahara/lib.php
+++ b/portfolio/mahara/lib.php
@@ -33,7 +33,7 @@ class portfolio_plugin_mahara extends portfolio_plugin_pull_base {
     }
 
     public static function supported_formats() {
-        return array(PORTFOLIO_FORMAT_FILE);
+        //return array(PORTFOLIO_FORMAT_FILE);
         // TODO remove above line once leap over mnet is tested
         return array(PORTFOLIO_FORMAT_FILE, PORTFOLIO_FORMAT_LEAP2A);
     }
@@ -373,6 +373,10 @@ class portfolio_plugin_mahara extends portfolio_plugin_pull_base {
         foreach ($this->supported_formats() as $f) {
             $class = $allformats[$f];
             if ($thisobj instanceof $class) {
+                // mahara's plugin is called "leap"
+                if ($f == 'leap2a') {
+                    $f = 'leap';
+                }
                 return $f;
             }
         }