Merge remote-tracking branch 'origin' into develop-2.1.x

Conflicts:
	root/portal/includes/functions_upload.php

root/includes/acp/acp_portal.php

@@ -188,7 +188,7 @@ class acp_portal
 				{
 					if ($submit && ((isset($null['type']) && $null['type'] == 'custom') || (isset($null['submit_type']) && $null['submit_type'] == 'custom')))
 					{
-						$func = array($this->c_class, $null['submit']);
+						$func = array($c_class, $null['submit']);
 
 						if(method_exists($this->c_class, $null['submit']))
 						{
@@ -202,7 +202,6 @@ class acp_portal
 						}
 					}
 
-					
 					if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
 					{
 						continue;
@@ -241,7 +240,6 @@ class acp_portal
 					$module_permission = array_intersect($module_permission, $groups_ary);
 					$module_permission = implode(',', $module_permission);
 
-					
 					$sql_ary = array(
 						'module_image_src'		=> request_var('module_image', ''),
 						'module_image_width'	=> request_var('module_img_width', 0),
@@ -297,7 +295,6 @@ class acp_portal
 					'U_ACTION'			=> $this->u_action . (($module_id) ? '&module_id=' . $module_id : ''),
 				));
 
-
 				// Output relevant page
 				foreach ($display_vars['vars'] as $config_key => $vars)
 				{

root/language/en/mods/portal/portal_calendar_module.php

@@ -128,7 +128,6 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_CALENDAR_PERMISSION_EXP'	=> 'Select the groups that should be authorized to view the event. If you want all users to be able to view the event, don’t select anything.<br />Select/Deselect multiple groups by holding <samp>CTRL</samp> and clicking.',
 	'PORTAL_EVENTS_URL_NEW_WINDOW'			=> 'Open external event links in a new window',
 
-	
 	// Logs
 	'LOG_PORTAL_EVENT_UPDATED'				=> '<strong>Updated Event</strong><br />&raquo; %s',
 	'LOG_PORTAL_EVENT_ADDED'				=> '<strong>Added Event</strong><br />&raquo; %s',

root/portal/modules/portal_announcements.php

@@ -464,10 +464,7 @@ class portal_announcements_module
 
 		// Get selected forums
 		$values = request_var($key, array(0 => ''));
-		
 		$news = implode(',', $values);
-		
 		set_config($key, $news);
-	
 	}
 }

root/portal/modules/portal_attachments.php

@@ -376,10 +376,7 @@ class portal_attachments_module
 
 		// Get selected extensions
 		$values = request_var($key, array(0 => ''));
-		
 		$news = implode(',', $values);
-		
 		set_config($key, $news);
-	
 	}
 }

root/portal/modules/portal_custom.php

@@ -209,7 +209,6 @@ class portal_custom_module
 					generate_text_for_storage($custom_code, $uid, $bitfield, $flags, true, true, true);
 				}
 
-				
 				// first check for obvious errors, we don't want to waste server resources
 				if(empty($custom_code))
 				{

root/portal/modules/portal_welcome.php

@@ -141,7 +141,6 @@ class portal_welcome_module
 				$options = 7;
 				generate_text_for_storage($welcome_message, $uid, $bitfield, $flags, true, true, true);
 
-				
 				// first check for obvious errors, we don't want to waste server resources
 				if(empty($welcome_message))
 				{