Commit 6ab3cf3c authored by Martyn Smith's avatar Martyn Smith Committed by Martyn Smith
Browse files
parents d73ba3f5 9d832d82
mahara (0.4.2-1) unstable; urgency=low
* Bugfix release
-- Nigel McNie <nigel@catalyst.net.nz> Wed, 24 Jan 2007 15:30:58 +1300
mahara (0.4.1-1) unstable; urgency=low
* Bugfix release
......
......@@ -372,7 +372,9 @@ class ArtefactTypeCachedProfileField extends ArtefactTypeProfileField {
parent::commit();
$field = $this->get_artefact_type();
set_field('usr', $field, $this->title, 'id', $this->owner);
$USER->set($field, $this->title);
if ($this->owner == $USER->get('id')) {
$USER->set($field, $this->title);
}
}
public function delete() {
......
......@@ -84,10 +84,7 @@ class User {
*
* @param string $key The key to get the value of
* @return mixed
* @throws KeyInvalidException
* @todo<nigel>: Given that KeyInvalidException doesn't actually exist,
* referring to an incorrect key will be fatal. I'm not going to do anything
* about this until more is known about what will be stored in the session.
* @throws InvalidArgumentException
*/
public function get($key) {
if (!isset($this->defaults[$key])) {
......
......@@ -93,7 +93,7 @@ $contactform = pieform(array(
function contactus_submit(Pieform $form, $values) {
$data = new StdClass;
$data->fromname = $values['name'];
$data->fromaddress = $values['email'];
$data->fromemail = $values['email'];
$data->subject = $values['subject'];
$data->message = $values['message'];
if ($values['userid']) {
......
......@@ -50,7 +50,7 @@ $string['dbconnfailed'] = 'Failed to connect to database, error message was %s';
// if you change these next two , be sure to change them in libroot/errors.php
// as they are duplicated there, in the case that get_string was not available.
$string['unrecoverableerror'] = 'A nonrecoverable error occured. This probably means that you have encountered a bug in the system';
$string['unrecoverableerror'] = 'A nonrecoverable error occurred. This probably means that you have encountered a bug in the system.';
$string['unrecoverableerrortitle'] = '%s - Site Unavailable';
$string['parameterexception'] = 'A required parameter was missing';
$string['accessdeniedexception'] = 'You do not have access to view this page';
......
......@@ -77,7 +77,7 @@ function pieform_render_viewacl_getvaluebytype($type, $id) {
return display_name($user);
break;
case 'group':
return get_field('group', 'name', 'id', $id);
return get_field('usr_group', 'name', 'id', $id);
break;
case 'community':
return get_field('community', 'name', 'id', $id);
......
......@@ -28,7 +28,7 @@ defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2007012301;
$config->release = '0.4.1';
$config->release = '0.4.2';
$config->minupgradefrom = 2006121501;
$config->minupgraderelease = '0.1 (build tag BUILD_20061215)';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment