From ebbfc71e573f6e3aa598a5aeae350044e37e65b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <emodric@users.noreply.github.com>
Date: Fri, 28 Aug 2015 16:47:00 +0200
Subject: [PATCH 1/2] Fix restoring working directory when building legacy CLI
 kernel handler

---
 mvc/Kernel/Loader.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mvc/Kernel/Loader.php b/mvc/Kernel/Loader.php
index e1931584..60c98aad 100644
--- a/mvc/Kernel/Loader.php
+++ b/mvc/Kernel/Loader.php
@@ -215,6 +215,7 @@ public function buildLegacyKernelHandlerCLI()
         {
             if ( !$that->getCLIHandler() )
             {
+                $currentDir = getcwd();
                 chdir( $legacyRootDir );
 
                 $legacyParameters = new ParameterBag( $container->getParameter( 'ezpublish_legacy.kernel_handler.cli.options' ) );
@@ -226,7 +227,8 @@ public function buildLegacyKernelHandlerCLI()
                 $that->setCLIHandler(
                     new CLIHandler( $legacyParameters->all(), $container->get( 'ezpublish.siteaccess' ), $container )
                 );
-                chdir( $webrootDir );
+
+                chdir( $currentDir );
             }
 
             return $that->getCLIHandler();

From 783f93adc89b501eafd073933f47448203da59d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <emodric@users.noreply.github.com>
Date: Fri, 28 Aug 2015 21:55:47 +0200
Subject: [PATCH 2/2] Remove unused variable

---
 mvc/Kernel/Loader.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mvc/Kernel/Loader.php b/mvc/Kernel/Loader.php
index 60c98aad..3c64ec33 100644
--- a/mvc/Kernel/Loader.php
+++ b/mvc/Kernel/Loader.php
@@ -206,12 +206,11 @@ public function getWebHandler()
     public function buildLegacyKernelHandlerCLI()
     {
         $legacyRootDir = $this->legacyRootDir;
-        $webrootDir = $this->webrootDir;
         $eventDispatcher = $this->eventDispatcher;
         $container = $this->container;
         $that = $this;
 
-        return function () use ( $legacyRootDir, $webrootDir, $container, $eventDispatcher, $that )
+        return function () use ( $legacyRootDir, $container, $eventDispatcher, $that )
         {
             if ( !$that->getCLIHandler() )
             {