Version 4.7.23

system/Helpers/Form/Editor.php

@@ -35,8 +35,9 @@ class _Editor extends FormAbstract
 	 			'foo'
 	 		),
 			'attachIdsLang'	=> NULL,		// Language ID number if this Editor is part of a Translatable field.
-	 		'minimize'		=> 'clickme',	// Language string to use for minimized view. NULL will mean editor is not minimized.
+	 		'minimize'		=> 'clickme',	// Language string to use for minimized view. NULL will mean editor is not minimized.0
 	 		'minimizeIcon'	=> 'flag-us',	// Icon to use for minimized view
+			'minimizeAfterReset' => FALSE, 	// Whether to minimize the editor after resetting (note resetting is handled by JS usually after AJAX submission)
 	 		'allButtons'	=> FALSE,		// Only used for the customisation ACP page. Do not use.
 	 		'tags'			=> array(),		// An array of extra insertable tags in key => value pair with key being what is inserted and value serving as a description
 	 		'autoGrow'		=> FALSE,		// Used to specify if editor should grow in size as content is added. Defaults to TRUE.
@@ -59,6 +60,7 @@ class _Editor extends FormAbstract
 		'attachIdsLang'			=> NULL,
 		'minimize'				=> NULL,
 		'minimizeIcon'			=> 'fa fa-comment-o',
+		'minimizeAfterReset'	=> FALSE,
 		'allButtons'			=> FALSE,
 		'tags'					=> array(),
 		'autoGrow'				=> TRUE,
@@ -524,6 +526,7 @@ class _Editor extends FormAbstract
 		}
 
 		/* Remove abandoned attachments */
+		/* @note SELECT_FROM_WRITE_SERVER Added in d901b5446e4fca3fc88c55d2de19397aeafc8911 We need to fetch from the write server to make sure we have all recenty added attachments */
 		foreach ( \IPS\Db::i()->select( '*', 'core_attachments', array( array( 'attach_id NOT IN(?)', \IPS\Db::i()->select( 'DISTINCT attachment_id', 'core_attachments_map', NULL, NULL, NULL, NULL, NULL, \IPS\Db::SELECT_FROM_WRITE_SERVER ) ), array( 'attach_member_id=? AND attach_date<?', \IPS\Member::loggedIn()->member_id, time() - 86400 ) ) ) as $attachment )
 		{
 			try
@@ -723,6 +726,7 @@ class _Editor extends FormAbstract
 				{
 					try
 					{
+						/* @note SELECT_FROM_WRITE_SERVER added 735824c35ab73cd81bd31cdfcc0435a71104f942 "RW DB issue with inserting data into core_temp_files and then reading it back" */
 						$fileInfo = \IPS\Db::i()->select( 'requires_moderation, labels', 'core_files_temp', array( 'contents=?', (string) $file ), NULL, NULL, NULL, NULL, \IPS\Db::SELECT_FROM_WRITE_SERVER )->first();
 						$requiresModeration = (bool) $fileInfo['requires_moderation'];
 						$labels = $fileInfo['labels'];