MDL-13010

Now correctly checks for category context id and does not fail if it isn't there.

Merged from STABLE_19

diff --git a/question/format.php b/question/format.php
index 1ec5ad46e170f450603bcda7a7965ed40c186749..ad5a9d4b5f19bcbd66183fa5cb05ce7b96eba086 100644 (file)
--- a/question/format.php
+++ b/question/format.php
@@ -359,7 +359,10 @@ class qformat_default {
         $catnames = explode($delimiter, $catpath);
         $parent = 0;
         $category = null;
-        if (FALSE !== preg_match('/^\$([a-z]+)\$$/', $catnames[0], $matches)){
+        
+        // check for context id in path, it might not be there in pre 1.9 exports
+        $matchcount = preg_match('/^\$([a-z]+)\$$/', $catnames[0], $matches);
+        if ($matchcount==1) {
             $contextid = $this->translator->string_to_context($matches[1]);
             array_shift($catnames);
         } else {