Author: mcantelon
Date: Wed Jan 18 11:44:35 2012
New Revision: 10713
Log:
Got rid of a coupl of lines of unneeded code.
Modified:
trunk/lib/QubitFlatfileImport.class.php
Modified: trunk/lib/QubitFlatfileImport.class.php
==============================================================================
--- trunk/lib/QubitFlatfileImport.class.php Wed Jan 18 11:40:45 2012
(r10712)
+++ trunk/lib/QubitFlatfileImport.class.php Wed Jan 18 11:44:35 2012
(r10713)
@@ -32,6 +32,7 @@
public $rowsUntilProgressDisplay;
public $status = array();
+ public $rowStatusVars = array();
public $columnNames = array();
public $ignoreColumns = array();
@@ -55,9 +56,6 @@
// initialize bookkeeping of rows processed
$this->status['rows'] = 0;
-
- // initialize row status variables
- $this->rowStatusVars = array();
}
@@ -86,6 +84,8 @@
{
if (!in_array($option, $ignore))
{
+ // if allowing all properties, inspect object to see if property is
legitimate
+ // otherwise use array of allowed properties
$settingAllowed = (
($allowedProperties === TRUE && property_exists(get_class($object),
$option))
|| (is_array($allowedProperties) && in_array($option,
$allowedProperties))
--
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.