Version 4.6.0

applications/core/sources/ProfileFields/Field.php

@@ -111,9 +111,9 @@ class _Field extends \IPS\CustomField
 	 * @param	\IPS\Member|NULL	$member			Member who completed the profile field		
 	 * @return	string
 	 */
-	public function displayValue( $value=NULL, $showSensitiveInformation=FALSE, $location=0, \IPS\Member $member = null )
+	public function displayValue( $value=NULL, $showSensitiveInformation=FALSE, $location=0, \IPS\Member $member = null, $bypassCustomFormatting=FALSE, $separator=NULL )
 	{
-		$formattedValue = parent::displayValue( $value, $showSensitiveInformation );
+		$formattedValue = parent::displayValue( $value, $showSensitiveInformation, $separator );
 		$member			= $member ?: new \IPS\Member;
 
 		switch( $location )
@@ -133,7 +133,7 @@ class _Field extends \IPS\CustomField
 
 			case ( static::PROFILE ):
 			case ( static::PROFILE_COMPLETION ):
-				if( $this->profile_format )
+				if( $this->profile_format and !$bypassCustomFormatting )
 				{
 					return $this->parseHtmlLogic( $this->profile_format, $value, $formattedValue, $member );
 				}
@@ -495,7 +495,12 @@ class _Field extends \IPS\CustomField
 	 * @note	Defined cache keys will be cleared automatically as needed
 	 */
 	protected $caches = array( 'profileFields' );
-	
+
+	/**
+	 * @brief	[CustomField] Database table
+	 */
+	protected static $contentDatabaseTable;
+
 	/**
 	 * [ActiveRecord] Delete Record
 	 *
@@ -503,8 +508,9 @@ class _Field extends \IPS\CustomField
 	 */
 	public function delete()
 	{
+		static::$contentDatabaseTable = 'core_pfields_content';
+
 		parent::delete();
-		\IPS\Db::i()->dropColumn( 'core_pfields_content', "field_{$this->id}" );
 		
 		/* Do we need to do stuff with profile steps? */
 		\IPS\Member\ProfileStep::resync();