From 73fc781bbacd62cecaa63265e77fb810cad7fd66 Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Sat, 23 May 2020 17:35:31 -0700
Subject: [PATCH] change directory structure to allow patches generated from
 noblogs-wp git repo can apply cleanly

---
 composer.json | 8 ++++----
 composer.lock | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index a5b5e274..f173d557 100644
--- a/composer.json
+++ b/composer.json
@@ -42,15 +42,15 @@
                 "wpackagist-plugin/disable-wordpress-updates",
                 "type:wordpress-muplugin"],
             "app/{$name}": ["type:wordpress-dropin"],
-            "app/content/plugins/{$name}/": ["type:wordpress-plugin"],
-            "app/content/themes/{$name}/": ["type:wordpress-theme"]
+            "app/wp-content/plugins/{$name}/": ["type:wordpress-plugin"],
+            "app/wp-content/themes/{$name}/": ["type:wordpress-theme"]
         },
         "wordpress-language-dir": "app/content/languages/",
         "wordpress-languages": [ "en_GB", "it_IT" ],
         "patches-file": "composer.patches.json",        
         "dropin-paths": {
-            "app/content/mu-plugins" : ["package:wpackagist-plugin/disable-wordpress-updates:disable-updates.php"],
-            "app/content": ["package:wpackagist-plugin/hyperdb:db.php"],
+            "app/wp-content/mu-plugins" : ["package:wpackagist-plugin/disable-wordpress-updates:disable-updates.php"],
+            "app/wp-content": ["package:wpackagist-plugin/hyperdb:db.php"],
             "app": ["package:lucha/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php"]
         }
     },
diff --git a/composer.lock b/composer.lock
index 1af8dd6a..b986c801 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "565f78e14e14ca0d9c05a68231bb78f3",
+    "content-hash": "343c6256f42881fdc6e4b6b3c1fa0597",
     "packages": [
         {
             "name": "bjornjohansen/wplang",
-- 
GitLab