Merge remote-tracking branch 'ogresCE/MAGETWO-31688-error-application-assets-broken-link' into PR_Branch

Author: mazhalai

pub/errors/processor.php

@@ -225,7 +225,13 @@ public function processReport()
      */
     public function getViewFileUrl()
     {
-        return $this->getBaseUrl() . self::ERROR_DIR . '/' . $this->_config->skin . '/';
+        //The url needs to be updated base on Document root path.
+        return $this->getBaseUrl() .
+        str_replace(
+            str_replace('\\', '/', $this->_indexDir),
+            '',
+            str_replace('\\', '/', $this->_errorDir)
+        ) . $this->_config->skin . '/';
     }
 
     /**
@@ -385,11 +391,6 @@ protected function _renderPage($template)
     protected function _getFilePath($file, $directories = null)
     {
         if (is_null($directories)) {
-            $directories = [];
-
-            if (!$this->_root) {
-                $directories[] = $this->_indexDir . self::ERROR_DIR . '/';
-            }
             $directories[] = $this->_errorDir;
         }
 
@@ -408,16 +409,6 @@ protected function _getFilePath($file, $directories = null)
      */
     protected function _getTemplatePath($template)
     {
-        $directories = [];
-
-        if (!$this->_root) {
-            $directories[] = $this->_indexDir . self::ERROR_DIR . '/' . $this->_config->skin . '/';
-
-            if ($this->_config->skin != self::DEFAULT_SKIN) {
-                $directories[] = $this->_indexDir . self::ERROR_DIR . '/' . self::DEFAULT_SKIN . '/';
-            }
-        }
-
         $directories[] = $this->_errorDir . $this->_config->skin . '/';
 
         if ($this->_config->skin != self::DEFAULT_SKIN) {