Changeset 938019

Timestamp:

06/24/2014 07:32:20 PM (12 years ago)

Author:

pmtarantino

Message:

Independence of the uploads directory structure, using wp_upload_dir()

Location:

multisite-cloner/trunk

Files:

• multisite-cloner.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)

multisite-cloner/trunk/multisite-cloner.php

@@ -5 +5 @@
  * Plugin URI: https://wordpress.org/plugins/multisite-cloner
  * Description: When creating a new blog on WordPress Multisite, copies all the posts, settings and files, from a selected blog into the new one.
- * Version: 0.1.4
+ * Version: 0.1.5
  * Author: Manuel Razzari & Patricio Tarantino
  * Author URI: http://tipit.net
@@ -143 +143 @@
 
     function set_new_blog( $blog_id=false ) {
-
         global $wpdb;
 
@@ -193 +192 @@
         }
 
-        $old_uploads = 'wp-content/uploads/sites/' . $id_default_blog;
-        $new_uploads = 'wp-content/uploads/sites/' . $blog_id;
+        $wp_uploads_dir = wp_upload_dir();
+        $base_dir = $wp_uploads_dir['basedir'];
+        $relative_base_dir = str_ireplace(get_home_path(), '', $base_dir);
+
+        $old_uploads = str_ireplace($blog_id, $id_default_blog, $relative_base_dir);;
+        $new_uploads = $relative_base_dir;
 
         // Replace URLs and paths in the DB
@@ -207 +210 @@
 
         // Copy Files
-        $new_uploads = '../../' . $new_uploads;
-        $old_uploads = '../../' . $old_uploads;
+        $old_uploads = str_ireplace($blog_id, $id_default_blog, $base_dir);;
+        $new_uploads = $base_dir;;
 
         cloner_recurse_copy($old_uploads, $new_uploads);

multisite-cloner/trunk/readme.txt

@@ -62 +62 @@
 == Changelog ==
 
+= 0.1.5 =
+* Independence of the uploads directory structure. ([Issue: Gives warning after creating subdomain site](http://wordpress.org/support/topic/gives-warning-after-creating-subdomain-site))
+
 = 0.1.4 =
 * First public release.
@@ -81 +84 @@
 == Upgrade Notice ==
 
-= 0.1.4 =
-This is the first public release.
+= 0.1.5 =
+* Independence of the uploads directory structure.