Display a message for each deleted file, not just the last one.

joomla · Jan 22, 2016 · ab719f4 · ab719f4
1 parent 27f3371
commit ab719f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/administrator/components/com_media/controllers/file.php b/administrator/components/com_media/controllers/file.php
@@ -228,6 +228,9 @@ public function delete()
 			return false;
 		}
 
+		// Need this to enqueue messages.
+		$app = JFactory::getApplication();
+
 		// Set FTP credentials, if given
 		JClientHelper::setCredentialsFromRequest('ftp');
 
@@ -268,7 +271,7 @@ public function delete()
 
 				// Trigger the onContentAfterDelete event.
 				$dispatcher->trigger('onContentAfterDelete', array('com_media.file', &$object_file));
-				$this->setMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+				$app->enqueueMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
 
 				continue;
 			}
@@ -302,10 +305,12 @@ public function delete()
 
 				// Trigger the onContentAfterDelete event.
 				$dispatcher->trigger('onContentAfterDelete', array('com_media.folder', &$object_file));
-				$this->setMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+				$app->enqueueMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
 			}
 		}
 
+		print_r($app); die();
+
 		return $ret;
 	}
 }
diff --git a/administrator/components/com_media/controllers/folder.php b/administrator/components/com_media/controllers/folder.php
@@ -63,6 +63,9 @@ public function delete()
 			return false;
 		}
 
+		// Need this to enqueue messages.
+		$app = JFactory::getApplication();
+
 		// Set FTP credentials, if given
 		JClientHelper::setCredentialsFromRequest('ftp');
 
@@ -102,7 +105,7 @@ public function delete()
 
 					// Trigger the onContentAfterDelete event.
 					$dispatcher->trigger('onContentAfterDelete', array('com_media.file', &$object_file));
-					$this->setMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+					$app->enqueueMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
 				}
 				elseif (is_dir($object_file->filepath))
 				{
@@ -125,7 +128,7 @@ public function delete()
 
 						// Trigger the onContentAfterDelete event.
 						$dispatcher->trigger('onContentAfterDelete', array('com_media.folder', &$object_file));
-						$this->setMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+						$app->enqueueMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
 					}
 					else
 					{