Changeset 13209 for trunk/wp-admin/includes/ms.php

Timestamp:

02/19/2010 01:03:58 AM (17 years ago)

Author:

nacin

Message:

Assume WP_DEBUG is defined in wpdb. Remove unnecessary constant() calls. Ensure DB_COLLATE defined as empty string doesn't override default Multisite collation. fixes #12041, see #11644

File:

• trunk/wp-admin/includes/ms.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -76 +76 @@
                 }
                 $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->blogs WHERE blog_id = %d", $blog_id) );
-                $dir = apply_filters( 'wpmu_delete_blog_upload_dir', constant( "WP_CONTENT_DIR" ) . "/blogs.dir/{$blog_id}/files/", $blog_id );
+                $dir = apply_filters( 'wpmu_delete_blog_upload_dir', WP_CONTENT_DIR . "/blogs.dir/{$blog_id}/files/", $blog_id );
                 $dir = rtrim($dir, DIRECTORY_SEPARATOR);
                 $top_dir = $dir;