Merge remote-tracking branch 'origin/master'

backend/web/filemanager/config/config.php

@@ -26,7 +26,7 @@ $base_url =
 	'://'.
 	// Get domain portion
 	$_SERVER['HTTP_HOST']; // DON'T TOUCH (base url (only domain) of site (without final /)).
-$upload_dir = '/source/'; // path from base_url to base of upload folder (with start and final /)
+$upload_dir = '/uploads/source/'; // path from base_url to base of upload folder (with start and final /)
 $current_path = '../../../frontend/web/uploads/source/'; // relative path from filemanager folder to upload folder (with final /)
 //thumbs folder can't put inside upload folder
 $thumbs_base_path = '../../../frontend/web/uploads/thumbs/'; // relative path from filemanager folder to thumbs folder (with final /)