Version 4.7.6

system/Helpers/Form/Editor.php

@@ -46,6 +46,8 @@ class _Editor extends FormAbstract
 	 		'maxLength'		=> FALSE,	// The maximum length. Note that the content is HTML, so this isn't the maximum number of visible characters, so should only be used for database limits. The database's max allowed packet will override if smaller
 	 		'editorId'		=> NULL,	// Passed to editorAttachments. Only necessary if the name may be changed
 	 		'allowAttachments => TRUE,	// Should the editor show upload options?
+	 		'contentClass'	 => NULL,		// If set to a string, will check this class for prioritizing mentions to participants.
+	 		'contentId'			=> NULL,	// If set, will check this particular item ID for prioritizing mentions to participants.
 	 	);
 	 * @endcode
 	 */
@@ -68,6 +70,8 @@ class _Editor extends FormAbstract
 		'allowAttachments'		=> TRUE,
 		'ipsPlugins'			=> "ipsautolink,ipsautosave,ipsctrlenter,ipscode,ipscontextmenu,ipsemoticon,ipsimage,ipslink,ipsmentions,ipspage,ipspaste,ipsquote,ipsspoiler,ipsautogrow,ipssource,removeformat",
 		'profanityBlock'		=> TRUE,
+		'contentClass'			=> NULL,
+		'contentId'				=> NULL
 	);
 	
 	/**
@@ -356,7 +360,7 @@ class _Editor extends FormAbstract
 
 		/* Display */
 		$template = $raw ? 'editorRaw' : 'editor';
-		return \IPS\Theme::i()->getTemplate( 'forms', 'core', 'global' )->$template( $this->name, $value, $this->options, $allowed, md5( $this->options['autoSaveKey'] . ':' . session_id() ), $attachmentArea, json_encode( array() ), $this->options['tags'] );
+		return \IPS\Theme::i()->getTemplate( 'forms', 'core', 'global' )->$template( $this->name, $value, $this->options, $allowed, md5( $this->options['autoSaveKey'] . ':' . session_id() ), $attachmentArea, json_encode( array() ), $this->options['tags'], $this->options['contentClass'], $this->options['contentId'] );
 	}
 	
 	/**
@@ -463,7 +467,7 @@ class _Editor extends FormAbstract
 
 						$altText = NULL;
 
-						if ( ! empty( $attachment['attach_labels'] ) )
+						if ( \IPS\Settings::i()->ips_imagescanner_enable_discovery and ! empty( $attachment['attach_labels'] ) )
 						{
 							if ( $this->_altLabelWord === NULL )
 							{