apply contrib prefix to modules and themes from vendor

winmillwill · Sep 18, 2014 · 9d3d489 · 9d3d489
1 parent cedbfee
commit 9d3d489
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Mapper.php b/src/Mapper.php
@@ -65,11 +65,17 @@ public function mapContrib(InstallationManager $im, RepositoryManager $rm)
                     );
                 }
                 $name = explode('/', $package->getPrettyName())[1];
-                $typeInstallMap[$drupalType][rtrim($installPath, '/')] = sprintf(
-                    $typePathMap[$drupalType] . '/%s',
-                    'contrib',
-                    $name
-                );
+                $mapRef =& $typeInstallMap[$drupalType][rtrim($installPath, '/')] ;
+                if (in_array($drupalType, ['module', 'theme'])) {
+                    $mapRef = sprintf(
+                        $typePathMap[$drupalType] . '/%s',
+                        'contrib',
+                        $name
+                    );
+                }
+                else {
+                    $mapRef = $typePathMap[$drupalType];
+                }
             }
         }
         return array_intersect_key($typeInstallMap, $typePathMap);