From ca5bcc9fbabeaa192272e84e6ab4adbb00c5b4fe Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Mon, 1 Jul 2013 16:39:09 +0000
Subject: [PATCH] BUG 11603 "Please consider include 'special' pages..." SOLVED

- Please consider include "special" pages layout to the SKIN.
- Problema resuelto, se han customizado las interfaces "error404" y "updating", ahora estan disponibles en los
  skins "neoclassic" y "classic". Se ha validado esta interfaz en los skins, de no existir los templates en un
  determinado skin, automaticamente utilizara el template del skin "classic".
* Available from version ProcessMaker-2.5.2-testing.1
---
 gulliver/system/class.g.php         | 5 ++---
 workflow/public_html/sysGeneric.php | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index f4d52f69f..de8e2d674 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -5161,7 +5161,7 @@ class G
         return $url;
     }
 
-    public static function skinGetPathToSrcByVirtualUri($option)
+    public static function skinGetPathToSrcByVirtualUri($option, $sysConf)
     {
         $path = "";
         $ereg = "";
@@ -5182,12 +5182,11 @@ class G
             $strAux = str_replace($strSearch, null, $_SERVER["REQUEST_URI"]);
 
             if ($strAux != "") {
-                $skin = "base"; // classic
+                $skin = "base"; //classic
 
                 if (isset($_SESSION["currentSkin"])) {
                     $skin = $_SESSION["currentSkin"];
                 } else {
-                    $sysConf = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
 
                     if (isset($sysConf["default_skin"])) {
                         $skin = $sysConf["default_skin"];
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 64c09e248..c521bea52 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -326,8 +326,8 @@ spl_autoload_register(array("Bootstrap", "autoloadClass"));
 Bootstrap::registerClass("G",      PATH_GULLIVER . "class.g.php");
 Bootstrap::registerClass("System", PATH_HOME . "engine/classes/class.system.php");
 
-$skinPathErrors = G::skinGetPathToSrcByVirtualUri("errors");
-$skinPathUpdate = G::skinGetPathToSrcByVirtualUri("update");
+$skinPathErrors = G::skinGetPathToSrcByVirtualUri("errors", $config);
+$skinPathUpdate = G::skinGetPathToSrcByVirtualUri("update", $config);
 
 // defining Virtual URLs
 $virtualURITable = array ();