DataObjects/Core_template.php

diff --git a/DataObjects/Core_template.php b/DataObjects/Core_template.php
index 77a742a..0da9ff3 100644 (file)
--- a/DataObjects/Core_template.php
+++ b/DataObjects/Core_template.php
@@ -403,7 +403,7 @@ WHERE (
         static $done = false;
         
         $ff = HTML_FlexyFramework::get();
-        $lang = $lang ? $lang : $ff->locale;
+        $lang = $lang ? $lang : (isset($ff->locale) ? $ff->locale : 'en');
         if (!empty($done[$clsname.':'.$lang])) {
             return; // already sent headers and everything.
         }