Version 4.1.2

applications/core/sources/ProfileFields/Field.php

@@ -171,6 +171,17 @@ class _Field extends \IPS\CustomField
 				}
 				
 				static::$editorOptions['autoSaveKey'] = md5( get_called_class() . '-' . $row['pf_id'] ) . ( isset( \IPS\Request::i()->id ) ? '-' . \IPS\Request::i()->id : '' );
+
+				if( $row['pf_type'] == 'Editor' )
+				{
+					static::$editorOptions['attachIds'] = array( ( isset( \IPS\Request::i()->id ) ? \IPS\Request::i()->id : 0 ), $row['pf_id'] );
+				}
+				
+				if ( $location === STAFF )
+				{
+					/* @link https://community.invisionpower.com/4bugtrack/active-reports/required-profile-fields-shouldnt-be-required-for-admins-r8058/ */
+					$row['pf_not_null'] = 0;
+				}
 				
 				$return[ $groupId ][ $row['pf_id'] ] = static::constructFromData( $row )->buildHelper( $values[ 'field_' . $row['pf_id'] ] );
 			}
@@ -178,6 +189,32 @@ class _Field extends \IPS\CustomField
 				
 		return $return;
 	}
+
+	/**
+	 * Load Record
+	 *
+	 * @see		\IPS\Db::build
+	 * @param	int|string	$id					ID
+	 * @param	string		$idField			The database column that the $id parameter pertains to (NULL will use static::$databaseColumnId)
+	 * @param	mixed		$extraWhereClause	Additional where clause(s) (see \IPS\Db::build for details)
+	 * @return	static
+	 * @throws	\InvalidArgumentException
+	 * @throws	\OutOfRangeException
+	 */
+	public static function load( $id, $idField=NULL, $extraWhereClause=NULL )
+	{
+		$result = parent::load( $id, $idField, $extraWhereClause );
+
+		static::$editorOptions['autoSaveKey'] = md5( get_called_class() . '-' . $result->id ) . ( isset( \IPS\Request::i()->id ) ? '-' . \IPS\Request::i()->id : '' );
+
+		if( $result->type == 'Editor' )
+		{
+			static::$editorOptions['attachIds'] = array( ( isset( \IPS\Request::i()->id ) ? \IPS\Request::i()->id : 0 ), $result->id );
+		}
+
+		return $result;
+	}
+
 	
 	/**
 	 * Get Values