Merge pull request #751 from Fouppy/dev/fouppy/bug/1

Assets redirection on multisite
2013-05-06 11:01:42 -07:00
parent 3dab3d05dc fba4b0cc5b
commit 5af746fe35
1 changed files with 5 additions and 1 deletions
--- a/lib/activation.php
+++ b/lib/activation.php
@@ -190,7 +190,11 @@ function roots_theme_activation_action() {
    $roots_theme_activation_options['change_uploads_folder'] = false;

    update_option('uploads_use_yearmonth_folders', 0);
-    update_option('upload_path', 'assets');
+    if (!is_multisite()) {
+      update_option('upload_path', 'assets');
+    } else {
+      update_option('upload_path', '');
+    }
  }

  if ($roots_theme_activation_options['create_navigation_menus'] === 'true') {