merge fix

diff --git a/UpdateBjsTemplates.php b/UpdateBjsTemplates.php
index f7e8ffa..06cba76 100644 (file)
--- a/UpdateBjsTemplates.php
+++ b/UpdateBjsTemplates.php
@@ -43,7 +43,8 @@ class Pman_Cms_UpdateBjsTemplates extends Pman_Admin_UpdateBjsTemplates
     
     function updateData()
     {   
-         
+        $ff = HTML_FlexyFramework::get();
+      
         if (empty($ff->Pman_Cms)) {
             $this->jerr("config[Pman_Cms] is not set");
         }