Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00
parent 450d0ab6d1 6ae5fa6d36
commit 33fb82f376
75 changed files with 2274 additions and 724 deletions
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -3090,7 +3090,7 @@ class wsBase
            }

            if (! empty( $unpauseDate )) {
-                if (! preg_match( "/^\d{4}-\d{2}-\d{2}$/", $unpauseDate )) {
+                if (! preg_match( "/^\d{4}-\d{2}-\d{2}| \d{2}:\d{2}:\d{2}$/", $unpauseDate )) {
                    $result = new wsResponse( 100, G::LoadTranslation( "ID_INVALID_DATA" ) . " $unpauseDate" );

                    $g->sessionVarRestore();