Merge branch 'hotfix-json-import'

cdevroe · Mar 24, 2014 · bcc231e · bcc231e
2 parents 51bd566 + e2cb24b
commit bcc231e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/libraries/JSONImportStateMachine/JSONImportStateMarks.php b/application/libraries/JSONImportStateMachine/JSONImportStateMarks.php
@@ -91,7 +91,7 @@ public function processLine($line)
             // Strip trailing comma and simulate JSON
             $jsonLine = mb_ereg_replace("\\,[ ]*$", '', $line);
             $decodedMark = json_decode($jsonLine);
-            $importResult = $this->CI->Mark_Import->importMark($decodedMark);
+            $importResult = $this->CI->mark_import->importMark($decodedMark);
             $this->importData['result']['total'] ++;
             $this->importData['result'][$importResult['result']] ++;
             if (self::RETURN_DETAILS && (! self::RETURN_DETAILS_ERRORS_ONLY || $importResult['result'] === self::RESULT_FAILED || ! empty($importResult['warnings']))) {