Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-816

2014-11-04 09:25:26 -04:00
parent 75556a6159 f82776aebb
commit 4664cead3f
2 changed files with 15 additions and 3 deletions
--- a/workflow/engine/methods/setup/loginSettingsAjax.php
+++ b/workflow/engine/methods/setup/loginSettingsAjax.php
@@ -34,6 +34,7 @@ switch ($request) {
        //remove from memcache when this value is updated/created
        $memcache->delete( 'flagForgotPassword' );

+        $response = new stdclass();
        $response->success = true;
        G::auditLog("UpdateLoginSettings", "DefaultLanguage->".$lang." EnableForgotPassword->".$conf->aConfig['login_enableForgotPassword']);