Merge remote branch 'upstream/master' into BUG-9830

2012-10-31 14:46:08 -04:00
parent 7a1483b81b 3eb5ae70ab
commit 74f577b5f5
3 changed files with 207 additions and 44 deletions
--- a/workflow/engine/classes/class.dynaformEditor.php
+++ b/workflow/engine/classes/class.dynaformEditor.php
@@ -229,7 +229,7 @@ class dynaformEditor extends WebResource
    var DYNAFORM_URL="' . $Parameters['URL'] . '";
    leimnud.event.add(window,"load",function(){ loadEditor(); });
    ');
-        $oHeadPublisher->addScriptCode(' var jsMeta;');
+        $oHeadPublisher->addScriptCode(' var jsMeta;var usernameLogged = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";');
        G::RenderPage("publish", 'blank');
    }

@@ -923,4 +923,3 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
        }
    }
 }
-