Merge with git+ssh://git.catalyst.net.nz/var/git/mahara.git

htdocs/artefact/internal/lib.php

@@ -255,23 +255,25 @@ class ArtefactTypeProfile extends ArtefactType {
             'type' => 'html',
             'value' => ' ',
         );
+        $currentwidth = get_config_plugin('artefact', 'internal', 'profileiconwidth');
         $form['elements']['profileiconwidth'] = array(
             'type' => 'text',
             'size' => 4,
             'suffix' => get_string('widthshort'),
             'title' => get_string('profileiconsize', 'artefact.internal'),
-            'defaultvalue' => get_config_plugin('artefact', 'internal', 'profileiconwidth'),
+            'defaultvalue' => ((!empty($currentwidth)) ? $currentwidth : 100),
             'rules' => array(
                 'required' => true,
                 'integer'  => true,
             )
         );
+        $currentheight = get_config_plugin('artefact', 'internal', 'profileiconheight');
         $form['elements']['profileiconheight'] = array(
             'type' => 'text',
             'suffix' => get_string('heightshort'),
             'size' => 4,
             'title' => get_string('profileiconsize', 'artefact.internal'),
-            'defaultvalue' => get_config_plugin('artefact', 'internal', 'profileiconheight'),
+            'defaultvalue' => ((!empty($currentheight)) ? $currentheight : 100),
             'rules' => array(
                 'required' => true,
                 'integer'  => true,

htdocs/artefact/internal/profile/validate.php

@@ -28,7 +28,7 @@ define('INTERNAL', 1);
 define('PUBLIC', 1);
 
 require(dirname(dirname(dirname(dirname(__FILE__)))) . '/init.php');
-require_once('form.php');
+require_once('pieforms/pieform.php');
 safe_require('artefact', 'internal');
 
 $email = param_variable('email');