diff vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)
author Chris Cannam
date Fri, 23 Feb 2018 15:52:07 +0000
parents 4c8ae668cc8c
children 129ea1e6d783
line wrap: on
line diff
--- a/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php	Fri Feb 23 15:51:18 2018 +0000
+++ b/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php	Fri Feb 23 15:52:07 2018 +0000
@@ -32,15 +32,15 @@
 
     protected function inflectPluginVars($vars)
     {
-        $vars['name'] = preg_replace('/-plugin$/', '', $vars['name']);
+        $vars['name'] = preg_replace('/^oc-|-plugin$/', '', $vars['name']);
 
         return $vars;
     }
 
     protected function inflectThemeVars($vars)
     {
-        $vars['name'] = preg_replace('/-theme$/', '', $vars['name']);
+        $vars['name'] = preg_replace('/^oc-|-theme$/', '', $vars['name']);
 
         return $vars;
     }
-}
\ No newline at end of file
+}