Version 4.1.19

applications/cms/modules/admin/pages/media.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Pages Media Management
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2015 Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	Pages
+ * @package		IPS Community Suite
+ * @subpackage	Content
  * @since		07 Jul 2015
  * @version		SVN_VERSION_NUMBER
  */
@@ -207,7 +207,7 @@ class _media extends \IPS\Node\Controller
 		$form = new \IPS\Helpers\Form( 'form', 'upload' );
 		$form->class = 'ipsForm_vertical ipsForm_noLabels';
 			
-		$form->add( new \IPS\Helpers\Form\Upload( 'media_filename', NULL, FALSE, array( 'allowedFileTypes' => \IPS\File::$safeFileExtensions, 'obscure' => FALSE, 'maxFileSize' => 5, 'storageExtension' => 'core_Theme', 'storageContainer' => 'pages_media', 'multiple' => true, 'minimize' => FALSE ), NULL, NULL, NULL, 'media_filename' ) );
+		$form->add( new \IPS\Helpers\Form\Upload( 'media_filename', NULL, FALSE, array( 'allowedFileTypes' => array_merge( \IPS\File::$safeFileExtensions, array( 'pdf' ) ), 'obscure' => FALSE, 'maxFileSize' => 5, 'storageExtension' => 'core_Theme', 'storageContainer' => 'pages_media', 'multiple' => true, 'minimize' => FALSE ), NULL, NULL, NULL, 'media_filename' ) );
 			
 		if ( ! isset( \IPS\Request::i()->media_parent ) and ! \IPS\Request::i()->media_parent )
 		{
@@ -260,7 +260,14 @@ class _media extends \IPS\Node\Controller
 				
 				$new->setFullPath( ( $parent ? \IPS\cms\Media\Folder::load( $parent )->path : '' ) );
 				$new->save();
-
+				
+				/* Remove the original as we created a copy with a slightly altered filename */
+				try
+				{
+					$media->delete();
+				}
+				catch( \Exception $ex ) { }
+				
 				$count++;
 			}