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
This commit is contained in:
Luis Fernando Saisa Lopez
2013-07-01 16:39:09 +00:00
parent 709f1a87d6
commit ca5bcc9fba
2 changed files with 4 additions and 5 deletions

View File

@@ -5161,7 +5161,7 @@ class G
return $url; return $url;
} }
public static function skinGetPathToSrcByVirtualUri($option) public static function skinGetPathToSrcByVirtualUri($option, $sysConf)
{ {
$path = ""; $path = "";
$ereg = ""; $ereg = "";
@@ -5182,12 +5182,11 @@ class G
$strAux = str_replace($strSearch, null, $_SERVER["REQUEST_URI"]); $strAux = str_replace($strSearch, null, $_SERVER["REQUEST_URI"]);
if ($strAux != "") { if ($strAux != "") {
$skin = "base"; // classic $skin = "base"; //classic
if (isset($_SESSION["currentSkin"])) { if (isset($_SESSION["currentSkin"])) {
$skin = $_SESSION["currentSkin"]; $skin = $_SESSION["currentSkin"];
} else { } else {
$sysConf = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
if (isset($sysConf["default_skin"])) { if (isset($sysConf["default_skin"])) {
$skin = $sysConf["default_skin"]; $skin = $sysConf["default_skin"];

View File

@@ -326,8 +326,8 @@ spl_autoload_register(array("Bootstrap", "autoloadClass"));
Bootstrap::registerClass("G", PATH_GULLIVER . "class.g.php"); Bootstrap::registerClass("G", PATH_GULLIVER . "class.g.php");
Bootstrap::registerClass("System", PATH_HOME . "engine/classes/class.system.php"); Bootstrap::registerClass("System", PATH_HOME . "engine/classes/class.system.php");
$skinPathErrors = G::skinGetPathToSrcByVirtualUri("errors"); $skinPathErrors = G::skinGetPathToSrcByVirtualUri("errors", $config);
$skinPathUpdate = G::skinGetPathToSrcByVirtualUri("update"); $skinPathUpdate = G::skinGetPathToSrcByVirtualUri("update", $config);
// defining Virtual URLs // defining Virtual URLs
$virtualURITable = array (); $virtualURITable = array ();