tonyair/silverstripe-multiform
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-multiform synced 2024-10-22 11:05:49 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: column and table names now quoted properly

Browse Source
This commit is contained in:
Geoff Munn 2010-03-14 21:09:04 +00:00
parent 794e74bebe
commit f508442eb5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/MultiForm.php
View File

@ -172,7 +172,7 @@ abstract class MultiForm extends Form {
// Determine whether we use the current step, or create one if it doesn't exist // Determine whether we use the current step, or create one if it doesn't exist
if(isset($_GET['StepID'])) { if(isset($_GET['StepID'])) {
$stepID = (int)$_GET['StepID']; $stepID = (int)$_GET['StepID'];
$currentStep = DataObject::get_one('MultiFormStep', "SessionID = {$this->session->ID} AND ID = {$stepID}"); $currentStep = DataObject::get_one('MultiFormStep', "\"SessionID\" = {$this->session->ID} AND \"ID\" = {$stepID}");
} elseif($this->session->CurrentStepID) { } elseif($this->session->CurrentStepID) {
$currentStep = $this->session->CurrentStep(); $currentStep = $this->session->CurrentStep();
} else { } else {
@ -251,7 +251,7 @@ abstract class MultiForm extends Form {
function getCurrentSession() { function getCurrentSession() {
if(!$this->currentSessionHash) return false; if(!$this->currentSessionHash) return false;
$SQL_hash = Convert::raw2sql($this->currentSessionHash); $SQL_hash = Convert::raw2sql($this->currentSessionHash);
return DataObject::get_one('MultiFormSession', "Hash = '$SQL_hash' AND IsComplete = 0"); return DataObject::get_one('MultiFormSession', "\"Hash\" = '$SQL_hash' AND \"IsComplete\" = 0");
} }
/** /**
@ -282,7 +282,7 @@ abstract class MultiForm extends Form {
function getSavedStepByClass($className) { function getSavedStepByClass($className) {
return DataObject::get_one( return DataObject::get_one(
'MultiFormStep', 'MultiFormStep',
sprintf("SessionID = '%s' AND ClassName = '%s'", sprintf("\"SessionID\" = '%s' AND \"ClassName\" = '%s'",
$this->session->ID, $this->session->ID,
Convert::raw2sql($className) Convert::raw2sql($className)
) )
@ -405,7 +405,7 @@ abstract class MultiForm extends Form {
} }
// Determine whether we can use a step already in the DB, or have to create a new one // Determine whether we can use a step already in the DB, or have to create a new one
if(!$nextStep = DataObject::get_one($nextStepClass, "SessionID = {$this->session->ID}")) { if(!$nextStep = DataObject::get_one($nextStepClass, "\"SessionID\" = {$this->session->ID}")) {
$nextStep = new $nextStepClass(); $nextStep = new $nextStepClass();
$nextStep->SessionID = $this->session->ID; $nextStep->SessionID = $this->session->ID;
$nextStep->write(); $nextStep->write();