Merge branch 'master' into wip_leon_T7737_Review_publisher_look_for_all

diff --cc DataObjects/Core_templatestr.php
index 6ec003b,e927fba..9d2e4ca
--- 1/DataObjects/Core_templatestr.php
--- 2/DataObjects/Core_templatestr.php
+++ b/DataObjects/Core_templatestr.php
@@@ -96,22 -96,11 +96,24 @@@ class Pman_Core_DataObjects_Core_templa
          }
          $cols = $ff['DataObjects_Core_templatestr']['tables'][$tn];
          
-         
+         $deactive = array();
+         $active = array();
+ 
          foreach($cols as $c) {
              $x = $this->factory($this->tableName());
 +            if(strpos($c, ',') !== false) {
 +                $arr = explode(',', $c);
 +                $c = $arr[0];
 +                $cond = $arr[1];
 +
 +                $ar = explode('=', $cond);
 +                $key = $ar[0];
 +
 +                // skip if condition not fulfilled
 +                if($obj->{$ar[0]} != $ar[1]) {
 +                    continue;
 +                }
 +            }
              $x->on_id = $obj->pid();
              $x->on_table = $tn;
              $x->on_col = $c;