Author: mcantelon
Date: Mon Jan 2 12:43:25 2012
New Revision: 10511
Log:
Fixed minor bug and clumbsy if condition.
Modified:
trunk/lib/QubitFlatfileImport.class.php
Modified: trunk/lib/QubitFlatfileImport.class.php
==============================================================================
--- trunk/lib/QubitFlatfileImport.class.php Mon Jan 2 12:24:20 2012
(r10510)
+++ trunk/lib/QubitFlatfileImport.class.php Mon Jan 2 12:43:25 2012
(r10511)
@@ -86,7 +86,7 @@
{
if (
!in_array($column, $this->ignoreColumns)
- && !isset($this->standardColumns[$column])
+ && !in_array($column, $this->standardColumns)
&& !isset($this->columnMap[$column])
&& !isset($this->propertyMap[$column])
&& !isset($this->noteMap[$column])
@@ -182,7 +182,7 @@
}
else if (
isset($self->columns[$index])
- && array_search($self->columns[$index], $self->standardColumns) !==
FALSE
+ && in_array($self->columns[$index], $self->standardColumns)
)
{
$self->informationObject->{$self->columns[$index]} = $value;
@@ -308,7 +308,7 @@
$query = "SELECT * FROM term t \r
LEFT JOIN term_i18n ti ON t.id=ti.id AND ti.culture='en' \r
WHERE taxonomy_id=?";
- $statement = $this->sqlQuery($query, array($taxonomyId));
+ $statement = QubitFlatfileImport::sqlQuery($query, array($taxonomyId));
while($term = $statement->fetch(PDO::FETCH_OBJ))
{
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
