MDL-16423 - make the button object more robust by detecting errors better

diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php
index e0672347f3846cdedddadf79a269289a0c8fe9b7..fc3cb35a24726c12829104c643f74557d777106e 100644 (file)
--- a/lib/portfoliolib.php
+++ b/lib/portfoliolib.php
@@ -144,6 +144,12 @@ class portfolio_add_button {
             }
             $formats = call_user_func(array($this->callbackclass, 'supported_formats'));
         }
+        $allformats = portfolio_supported_formats();
+        foreach ($formats as $f) {
+            if (!array_key_exists($f, $allformats)) {
+                throw new portfolio_button_exception('invalidformat', 'portfolio', $f);
+            }
+        }
         $this->formats = $formats;
     }