- drop obsolete and outdated manual inclusion of rpm macros

[packages/wordpress.git] / multisite.patch

diff --git a/multisite.patch b/multisite.patch
index 79f6343e2544b3e9b3a3ef8e5d61d43a76226e72..e61151afe987030b1443fdf70864be1e90ae57ee 100644 (file)
--- a/multisite.patch
+++ b/multisite.patch
@@ -13,3 +13,25 @@
  /* That's all, stop editing! Happy blogging. */
  
  /** Absolute path to the WordPress directory. */
+--- wordpress-3.5.1/wp-includes/ms-default-constants.php~      2013-02-06 16:12:50.000000000 +0200
++++ wordpress-3.5.1/wp-includes/ms-default-constants.php       2013-02-06 16:14:43.844078357 +0200
+@@ -26,7 +26,7 @@
+ 
+       // Base uploads dir relative to ABSPATH
+       if ( !defined( 'UPLOADBLOGSDIR' ) )
+-              define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
++              define( 'UPLOADBLOGSDIR', '/var/lib/wordpress' );
+ 
+       // Note, the main site in a post-MU network uses wp-content/uploads.
+       // This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
+@@ -34,8 +34,8 @@
+               define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+ 
+               // Uploads dir relative to ABSPATH
+-              if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
+-                      define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
++              if ( ('wp-content/blogs.dir' == UPLOADBLOGSDIR  || '/var/lib/wordpress' == UPLOADBLOGSDIR) && ! defined( 'BLOGUPLOADDIR' ) )
++                      define( 'BLOGUPLOADDIR', "/var/lib/wordpress/{$wpdb->blogid}/files/" );
+       }
+ }
+