X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fdrupal%2Fconsole%2Fsrc%2FCommand%2FMultisite%2FNewCommand.php;fp=vendor%2Fdrupal%2Fconsole%2Fsrc%2FCommand%2FMultisite%2FNewCommand.php;h=cabaa4306efcb5d3d9220ff53e85a920e685473c;hp=5f8bcf1b547c72752af3fed73c49496446b0c106;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae

diff --git a/vendor/drupal/console/src/Command/Multisite/NewCommand.php b/vendor/drupal/console/src/Command/Multisite/NewCommand.php
index 5f8bcf1b5..cabaa4306 100644
--- a/vendor/drupal/console/src/Command/Multisite/NewCommand.php
+++ b/vendor/drupal/console/src/Command/Multisite/NewCommand.php
@@ -70,7 +70,7 @@ class NewCommand extends Command
             )
             ->addOption(
                 'copy-default',
-                '',
+                null,
                 InputOption::VALUE_NONE,
                 $this->trans('commands.multisite.new.options.copy-default')
             );
@@ -159,7 +159,7 @@ class NewCommand extends Command
             throw new FileNotFoundException($this->trans('commands.multisite.new.errors.sites-missing'));
         }
 
-        $sites_file_contents .= "\n\$sites['$uri'] = '$this->directory';";
+        $sites_file_contents .= "\n\$sites['$this->directory'] = '$this->directory';";
 
         try {
             $this->fs->dumpFile($this->appRoot . '/sites/sites.php', $sites_file_contents);
@@ -183,7 +183,7 @@ class NewCommand extends Command
                     'sites/default/settings.php'
                 )
             );
-            return;
+            return 1;
         }
 
         if ($this->fs->exists($this->appRoot . '/sites/default/files')) {
@@ -200,7 +200,7 @@ class NewCommand extends Command
                         'sites/' . $this->directory . '/files'
                     )
                 );
-                return;
+                return 1;
             }
         } else {
             $io->warning($this->trans('commands.multisite.new.warnings.missing-files'));
@@ -221,7 +221,7 @@ class NewCommand extends Command
                     'sites/' . $this->directory . '/settings.php'
                 )
             );
-            return;
+            return 1;
         }
 
         $this->chmodSettings($io);
@@ -255,7 +255,7 @@ class NewCommand extends Command
                         $this->appRoot . '/sites/' . $this->directory . '/settings.php'
                     )
                 );
-                return;
+                return 1;
             }
         } else {
             $io->error(
@@ -264,7 +264,7 @@ class NewCommand extends Command
                     'sites/default/default.settings.php'
                 )
             );
-            return;
+            return 1;
         }
 
         $this->chmodSettings($io);
@@ -275,6 +275,8 @@ class NewCommand extends Command
                 $this->directory
             )
         );
+
+        return 0;
     }
 
     /**
@@ -297,6 +299,8 @@ class NewCommand extends Command
                     $this->appRoot . '/sites/' . $this->directory . '/settings.php'
                 )
             );
+
+            return 1;
         }
     }
 }