Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle

7a6b7f0b · Dan Poltawski · Andrew Nicols · f17eb367 · 288ac7b9 · 7a6b7f0b
Commit 7a6b7f0b authored Jan 31, 2017 by Dan Poltawski Committed by Andrew Nicols Feb 01, 2017
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -3702,7 +3702,7 @@ abstract class workshop_assessment_base {
    protected $fields = array();

    /** @var workshop */
-    protected $workshop;
+    public $workshop;

    /**
     * Copies the properties of the given database record into properties of $this instance