X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plekit%2Fphp%2Fcolumns.php;h=0ef58a97c33744a590593c81914aa78632a79d65;hb=a38b7921e68e9f0b6cd290457302ef744f3be1fe;hp=fbe6142fe946965f7d6fc8552c86946b71f4cc16;hpb=bbdd2d949c4f1dc8db02dcc184d651f534a7b2a5;p=plewww.git

diff --git a/plekit/php/columns.php b/plekit/php/columns.php
index fbe6142..0ef58a9 100644
--- a/plekit/php/columns.php
+++ b/plekit/php/columns.php
@@ -68,6 +68,14 @@ $this->all_headers[$column['header']]=array('header'=>$column['header'],'type'=>
 }
 
 $tmp_headers = array();
+
+if ($this->extra_columns)
+foreach ($this->extra_columns as $column) {
+$tmp_headers[$column['header']]=array('header'=>$column['header'],'type'=>$column['type'],'tagname'=>$column['tagname'],'title'=>$column['title'], 'description'=>$column['title'], 'label'=>$column['header'], 'fetched'=>$column['fetched'], 'visible'=>false, 'source'=>$column['source']);
+
+}
+
+if ($this->tag_columns)
 foreach ($this->tag_columns as $column) {
 
 if ($column['headerId'] != "")
@@ -75,17 +83,10 @@ if ($column['headerId'] != "")
 else
 	$headerId = $column['header'];
 
-//$this->all_headers[$headerId]=array('header'=>$headerId,'type'=>$column['type'],'tagname'=>$column['tagname'],'title'=>$column['title'], 'description'=>$column['title'], 'label'=>$column['header'],'visible'=>false);
 $tmp_headers[$headerId]=array('header'=>$headerId,'type'=>$column['type'],'tagname'=>$column['tagname'],'title'=>$column['title'], 'description'=>$column['title'], 'label'=>$column['header'],'visible'=>false, 'source'=>'myplc');
 }
 
-if ($this->extra_columns)
-foreach ($this->extra_columns as $column) {
-//$this->all_headers[$column['header']]=array('header'=>$column['header'],'type'=>$column['type'],'tagname'=>$column['tagname'],'title'=>$column['title'], 'description'=>$column['title'], 'label'=>$column['header'], 'fetched'=>$column['fetched'],'visible'=>false);
-$tmp_headers[$column['header']]=array('header'=>$column['header'],'type'=>$column['type'],'tagname'=>$column['tagname'],'title'=>$column['title'], 'description'=>$column['title'], 'label'=>$column['header'], 'fetched'=>$column['fetched'], 'visible'=>false, 'source'=>$column['source']);
-
 usort ($tmp_headers, create_function('$col1,$col2','return strcmp($col1["label"],$col2["label"]);'));
-}
 
 foreach ($tmp_headers as $t) 
 $this->all_headers[$t['header']] = $t;