Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00
parent f89014c14a 0cc58c934b
commit f55ff5bdae
144 changed files with 6902 additions and 2234 deletions
--- a/workflow/engine/classes/class.memcached.php
+++ b/workflow/engine/classes/class.memcached.php
@@ -66,7 +66,7 @@ class PMmemcached
                    $this->version = $this->mem->getVersion();
                }
            } else {
-                G::Loadclass( 'fileCache' );
+                require_once ('classes/class.fileCache.php');
                // create cache folder
                $cacheFolder = PATH_DATA . "sites/" . $workspace . "/cachefiles/";
                if (! file_exists( $cacheFolder )) {