Changeset 695338

Timestamp:

04/10/2013 03:45:31 PM (11 years ago)

Author:

jbrinley

Message:

find correct files directory on 3.5+ created networks

File:

• blog-copier/trunk/blog-copier.php (modified) (2 diffs)

blog-copier/trunk/blog-copier.php

@@ -204 +204 @@
          * @return string status message
          */
-        private function copy_blog($domain, $title, $from_blog_id = 0, $copy_files = true) {
+        p function copy_blog($domain, $title, $from_blog_id = 0, $copy_files = true) {
             global $wpdb, $current_site, $base;
 
@@ -344 +344 @@
          */
         private function copy_blog_files( $from_blog_id, $to_blog_id ) {
-            set_time_limit( 600 ); // 60 seconds x 10 minutes
+            set_time_limit( 00 ); // 60 seconds x 10 minutes
             @ini_set('memory_limit','2048M');
-            $base = WP_CONTENT_DIR . '/blogs.dir/';
+
             // Path to source blog files.
-            $from = apply_filters('copy_blog_files_from', trailingslashit( $base . $from_blog_id ), $base, $from_blog_id);
+            switch_to_blog($from_blog_id);
+            $dir_info = wp_upload_dir();
+            $from = str_replace(' ', "\\ ", trailingslashit($dir_info['basedir']).'*'); // * necessary with GNU cp, doesn't hurt anything with BSD cp
+            restore_current_blog();
+            $from = apply_filters('copy_blog_files_from', $from, $from_blog_id);
+
             // Path to destination blog files.
-            $to = apply_filters('copy_blog_files_to', trailingslashit( $base . $to_blog_id ), $base, $to_blog_id);
+            switch_to_blog($to_blog_id);
+            $dir_info = wp_upload_dir();
+            $to = str_replace(' ', "\\ ", trailingslashit($dir_info['basedir']));
+            restore_current_blog();
+            $to = apply_filters('copy_blog_files_to', $to, $to_blog_id);
+
             // Shell command used to copy files.
-            $command = apply_filters('copy_blog_files_command', "cp -rfp $from $to", $from, $to );
+            $command = apply_filters('copy_blog_files_command', , $from, $to );
             exec($command);
         }