diff options
| author | Dmitry <dmitry@dhtmlx.com> | 2012-07-12 18:21:06 +0200 |
|---|---|---|
| committer | Dmitry <dmitry@dhtmlx.com> | 2012-07-12 18:21:06 +0200 |
| commit | 67cd17d08079d59b9a3315b01b73bb60d599ed3f (patch) | |
| tree | 70b491910bf53fa8b54d66994dcc06f7c1519303 /codebase/strategy.php | |
| parent | 154b6e8708edc6b2df57f552aa086d7de98dee7b (diff) | |
| download | connector-php-67cd17d08079d59b9a3315b01b73bb60d599ed3f.zip connector-php-67cd17d08079d59b9a3315b01b73bb60d599ed3f.tar.gz connector-php-67cd17d08079d59b9a3315b01b73bb60d599ed3f.tar.bz2 | |
fix incorrect mix/unmix call
Diffstat (limited to 'codebase/strategy.php')
| -rw-r--r-- | codebase/strategy.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/codebase/strategy.php b/codebase/strategy.php index de32270..eb579b8 100644 --- a/codebase/strategy.php +++ b/codebase/strategy.php @@ -15,9 +15,11 @@ class RenderStrategy { * mix structure */ protected function mix($config, $mix) { - for ($i = 0; $i < count($mix); $i++) - if (!$config->is_field($mix[$i]['name'])) + for ($i = 0; $i < count($mix); $i++) { + if ($config->is_field($mix[$i]['name'])===-1) { $config->add_field($mix[$i]['name']); + } + } } /*! remove mix fields from DataConfig @@ -28,7 +30,9 @@ class RenderStrategy { */ protected function unmix($config, $mix) { for ($i = 0; $i < count($mix); $i++) { - $config->remove_field_full($mix[$i]['name']); + if ($config->is_field($mix[$i]['name'])!==-1) { + $config->remove_field_full($mix[$i]['name']); + } } } |