Merge code from github to bitbucket 2014-08-14

2014-08-14 13:53:06 -04:00
parent 9c3d298c26 1c9679d83b
commit 1d89dc5d13
37 changed files with 484 additions and 154 deletions
--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -227,7 +227,7 @@
  if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template
    file_put_contents(
      PATH_HTML . 'index.html',
-      G::parseTemplate(PATH_TPL . 'index.html', array('lang' => SYS_LANG, 'skin' => SYS_SKIN))
+      G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN))
    );
  }