Merge remote-tracking branch 'upstream/master'

Conflicts: workflow/engine/classes/class.processMap.php workflow/engine/classes/model/AdditionalTables.php
2014-04-02 09:34:54 -04:00
parent e5e62da380 92947e646a
commit 7a47472ea1
60 changed files with 597 additions and 314 deletions
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -177,7 +177,7 @@ class G
     * getIpAddress
     * @return string $ip
     */
-    public function getIpAddress ()
+    public static function getIpAddress ()
    {
        if (getenv( 'HTTP_CLIENT_IP' )) {
            $ip = getenv( 'HTTP_CLIENT_IP' );