Merge branch 'master' of bitbucket.org:colosa/processmaker into LISTS

workflow/engine/methods/setup/processHeartBeatAjax.php

@@ -5,7 +5,7 @@ switch ($_GET['action']) {
         try {
             G::LoadClass( 'serverConfiguration' );
             $oServerConf = & serverConf::getSingleton();
-
+            $response = new stdclass();
             /*you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace*/
             $oServerConf->unsetHeartbeatProperty( 'HB_BEAT_TYPE', 'HEART_BEAT_CONF' );
             if (isset( $_POST['acceptHB'] )) {

workflow/engine/methods/setup/systemInfo.php

@@ -17,6 +17,7 @@ switch ($option) {
         break;
     case "processInfo":
         $oHeadPublisher = &headPublisher::getSingleton();
+        $oHeadPublisher->assign('skin', $_SESSION['currentSkin']);
         $oHeadPublisher->addContent("setup/dbInfo"); //Adding a html file .html
         $oHeadPublisher->addExtJsScript("setup/dbInfo", false); //Adding a javascript file .js