Ticket #45725: enhance_uploads_directory_path.diff

functions.php

@@ -636 +636 @@
                         . '(?:'
                                 . '\([\w\d]+\)|'
                                 . '(?:'
-                                        . "[^`!()\[\]{};:'\".,<>«»“”‘’\s]|"
+                                        . "[^`!()\[\]{};:'\".,<>«»“”‘’\s]|"
                                         . '(?:[:]\d+)?/?'
                                 . ')+'
                         . ')'
@@ -2134 +2134 @@
          * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
          */
         if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
-                $dir = ABSPATH . UPLOADS;
+                $dir = defined( 'UPLOADS_DIR' ) ? UPLOADS_DIR : ( defined( 'INDEX_ABSPATH' ) ? SITE_ABSPATH : ABSPATH ) . UPLOADS ;
                 $url = trailingslashit( $siteurl ) . UPLOADS;
         }