Fix #7468 - updating template scanner

[Pman.Cms] / DataObjects / Cms_templatestr.php

diff --git a/DataObjects/Cms_templatestr.php b/DataObjects/Cms_templatestr.php
index 30235e5..0f87f1a 100644 (file)
--- a/DataObjects/Cms_templatestr.php
+++ b/DataObjects/Cms_templatestr.php
@@ -128,12 +128,28 @@ class Pman_Cms_DataObjects_Cms_templatestr extends DB_DataObject
             
             case 'transtree':
                // DB_DataObject::debugLevel(1);
+                $cfg = HTML_FlexyFramework::get()->Pman_Cms;
+                $defaults = isset($cfg['languages']) ? $cfg['languages'] : array();
+               
                 $x = DB_Dataobject::Factory($this->tableName());
                 $x->selectAdd();
                 $x->selectAdd('distinct(lang) as lang');
                 $x->whereAdd("lang != ''");
                 $ret= array();
+                $got = array();
                 foreach( $x->fetchAll('lang') as $l) {
+                    
+                    $ret[] = array(
+                        'text'=>$l,
+                        'id' =>$l,
+                        'language' => true
+                    );
+                    $got[] = $l;
+                }
+                foreach($defaults as $l) {
+                    if (in_array($l,$got)) {
+                        continue;
+                    }
                     $ret[] = array(
                         'text'=>$l,
                         'id' =>$l,