Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / vendor / composer / installers / src / Composer / Installers / OctoberInstaller.php

diff --git a/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php b/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php
index 6bf53fd141a168c5de54b4dd27dde98a9fa7d3cd..93b25de59ce2bec94f3df1b642061177347a01da 100644 (file)
--- a/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php
+++ b/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php
@@ -32,15 +32,15 @@ class OctoberInstaller extends BaseInstaller
 
     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
+}