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/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -499,8 +499,7 @@ class Main extends Controller

    public function getLanguagesList ()
    {
-        //translation
-        $Translations = G::getModel( "Translation" );
+        $Translations = new Translation;
        $translationsTable = $Translations->getTranslationEnvironments();

        if (($languagesList = $this->memcache->get( 'languagesList' )) === false) {