Skip to content

Commit 9072df0

Browse files
committed
Fixed a bug where the var_id column wouldn't be consistently NULL
1 parent 630f1b7 commit 9072df0

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

el_playamatrix_importer/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ If you run into anything, head on over to [the issues](https://github.com/EllisL
6262

6363
## Change Log
6464

65+
- 1.0.3 - May 10, 2016
66+
- Fixed a bug (#3) where the importer may fail if the `var_id` column in the Matrix columns table wasn't consistently `NULL`.
6567
- 1.0.2 - May 9, 2016
66-
- Fixed a bug (#2) where the importer may show an error if the `var_id` column was missing from the Matrix data table.
68+
- Fixed a bug (#2) where the importer may show an error if the `var_id` column was missing from the Matrix columns table.
6769
- 1.0.1 - March 16, 2016
6870
- Fixed a bug (#1) where the importer would not work if either Playa or Matrix were uninstalled while the other was installed.
6971
- Fixed a bug (#1) where importing a Playa field that had no relationships would cause errors.

el_playamatrix_importer/libraries/matrix_importer.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ private function get_matrix_columns()
167167
// Skip Low vars for now
168168
if (ee()->db->field_exists('var_id', 'matrix_cols'))
169169
{
170-
ee()->db->where('var_id', NULL);
170+
ee()->db->where('var_id', NULL)
171+
->or_where('var_id', 0);
171172
}
172173
$columns_query = ee()->db->get('matrix_cols')->result_array();
173174

0 commit comments

Comments
 (0)