From 9e3dd79b4e158ce04adf4cc940adc023d53e6581 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Thu, 7 Feb 2013 16:55:06 -0400
Subject: [PATCH] BUG 10690 "Cuando se introduce algunas paginas no
 existentes..." SOLVED

- URL no valid no redirects to the 404 page
- Solved problem in validation of template
- Solved problem, add validation for URL no valid
* Available from version ProcessMaker-2.0.46
---
 gulliver/system/class.g.php         | 4 ++--
 workflow/public_html/sysGeneric.php | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 4377f112b..f8fae74e5 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -4474,8 +4474,8 @@ class G
         $tplExists = true;
 
         // file has absolute path
-        if (substr( $template, 0, 1 ) != PATH_SEP) {
-            $template = PATH_TEMPLATE . $template;
+        if (strpos($template, PATH_TRUNK) === false) {
+            $template = PATH_TPL . $template;
         }
 
         // fix for template that have dot in its name but is not a valid extension
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index e9ef64c98..2ed01fb66 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -710,6 +710,10 @@ if (substr( SYS_COLLECTION, 0, 8 ) === 'gulliver') {
         if (is_callable( Array ($controllerClass,$controllerAction ) )) {
             $isControllerCall = true;
         }
+
+        if (substr(SYS_SKIN, 0, 2) != "ux" && $controllerClass == "main") {
+            $isControllerCall = false;
+        }
     }
     if (! $isControllerCall && ! file_exists( $phpFile ) && ! $isRestRequest) {
         $_SESSION['phpFileNotFound'] = $_SERVER['REQUEST_URI'];