tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 09:05:53 +00:00
Code Issues Projects Releases Wiki Activity

Adding double-quotes to table and field references

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66417 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-11-23 22:58:18 +00:00
parent a93a0c3c95
commit f067bd1304
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/CMSMain.php
View File

@ -360,13 +360,13 @@ JS;
$treeClass = $this->stat('tree_class'); $treeClass = $this->stat('tree_class');
if($id && is_numeric($id)) { if($id && is_numeric($id)) {
$record = DataObject::get_one( $treeClass, "\"$treeClass\".ID = $id"); $record = DataObject::get_one( $treeClass, "\"$treeClass\".\"ID\" = $id");
if(!$record) { if(!$record) {
// $record = Versioned::get_one_by_stage($treeClass, "Live", "\"$treeClass\".ID = $id"); // $record = Versioned::get_one_by_stage($treeClass, "Live", "\"$treeClass\".\"ID\" = $id");
Versioned::reading_stage('Live'); Versioned::reading_stage('Live');
singleton($treeClass)->flushCache(); singleton($treeClass)->flushCache();
$record = DataObject::get_one( $treeClass, "\"$treeClass\".ID = $id"); $record = DataObject::get_one( $treeClass, "\"$treeClass\".\"ID\" = $id");
if($record) { if($record) {
$record->DeletedFromStage = true; $record->DeletedFromStage = true;
} else { } else {
@ -400,7 +400,7 @@ JS;
$idField->setValue($id); $idField->setValue($id);
if($record->ID && is_numeric( $record->ID ) ) { if($record->ID && is_numeric( $record->ID ) ) {
$liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree\".ID = $record->ID"); $liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree\".\"ID\" = $record->ID");
if($liveRecord) $liveURLField->setValue($liveRecord->AbsoluteLink()); if($liveRecord) $liveURLField->setValue($liveRecord->AbsoluteLink());
} }
@ -596,7 +596,7 @@ JS;
*/ */
public function delete($urlParams, $form) { public function delete($urlParams, $form) {
$id = $_REQUEST['ID']; $id = $_REQUEST['ID'];
$record = DataObject::get_one("SiteTree", "SiteTree.ID = $id"); $record = DataObject::get_one("SiteTree", "SiteTree.\"ID\" = $id");
if($record && !$record->canDelete()) return Security::permissionFailure(); if($record && !$record->canDelete()) return Security::permissionFailure();
$recordID = $record->ID; $recordID = $record->ID;
@ -797,7 +797,7 @@ HTML;
$JS_title = Convert::raw2js($page->TreeTitle()); $JS_title = Convert::raw2js($page->TreeTitle());
$JS_stageURL = $page->DeletedFromStage ? '' : Convert::raw2js($page->AbsoluteLink()); $JS_stageURL = $page->DeletedFromStage ? '' : Convert::raw2js($page->AbsoluteLink());
$liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree\".ID = $page->ID"); $liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree\".\"ID\" = $page->ID");
$JS_liveURL = $liveRecord ? Convert::raw2js($liveRecord->AbsoluteLink()) : ''; $JS_liveURL = $liveRecord ? Convert::raw2js($liveRecord->AbsoluteLink()) : '';
FormResponse::add($this->getActionUpdateJS($page)); FormResponse::add($this->getActionUpdateJS($page));
@ -1240,8 +1240,8 @@ HTML;
if($id = $this->urlParams['ID']) { if($id = $this->urlParams['ID']) {
$restoredPage = Versioned::get_latest_version("SiteTree", $id); $restoredPage = Versioned::get_latest_version("SiteTree", $id);
$restoredPage->ID = $restoredPage->RecordID; $restoredPage->ID = $restoredPage->RecordID;
if(!DB::query("SELECT ID FROM SiteTree WHERE ID = $restoredPage->ID")->value()) { if(!DB::query("SELECT \"ID\" FROM \"SiteTree\" WHERE \"ID\" = $restoredPage->ID")->value()) {
DB::query("INSERT INTO SiteTree SET ID = $restoredPage->ID"); DB::query("INSERT INTO \"SiteTree\" SET \"ID\" = $restoredPage->ID");
} }
$restoredPage->forceChange(); $restoredPage->forceChange();
$restoredPage->writeWithoutVersion(); $restoredPage->writeWithoutVersion();

2
code/LeftAndMain.php
View File

@ -433,7 +433,7 @@ JS;
$SQL_id = Convert::raw2sql($_REQUEST['ID']); $SQL_id = Convert::raw2sql($_REQUEST['ID']);
if(substr($SQL_id,0,3) != 'new') { if(substr($SQL_id,0,3) != 'new') {
$record = DataObject::get_one($className, "\"$className\".ID = {$SQL_id}"); $record = DataObject::get_one($className, "\"$className\".\"ID\" = {$SQL_id}");
if($record && !$record->canEdit()) return Security::permissionFailure($this); if($record && !$record->canEdit()) return Security::permissionFailure($this);
} else { } else {
if(!singleton($this->stat('tree_class'))->canCreate()) return Security::permissionFailure($this); if(!singleton($this->stat('tree_class'))->canCreate()) return Security::permissionFailure($this);

14
code/sitefeatures/PageCommentInterface.php
View File

@ -142,15 +142,13 @@ class PageCommentInterface extends RequestHandler {
function Comments() { function Comments() {
// Comment limits // Comment limits
if(isset($_GET['commentStart'])) { $limit = array();
$limit = (int)$_GET['commentStart'].",".PageComment::$comments_per_page; $limit['start'] = isset($_GET['commentStart']) ? (int)$_GET['commentStart'] : 0;
} else { $limit['limit'] = PageComment::$comments_per_page;
$limit = "0,".PageComment::$comments_per_page;
}
$spamfilter = isset($_GET['showspam']) ? '' : 'AND IsSpam=0'; $spamfilter = isset($_GET['showspam']) ? '' : 'AND NOT "IsSpam"';
$unmoderatedfilter = Permission::check('ADMIN') ? '' : 'AND NeedsModeration = 0'; $unmoderatedfilter = Permission::check('ADMIN') ? '' : 'AND NOT "NeedsModeration"';
$comments = DataObject::get("PageComment", "ParentID = '" . Convert::raw2sql($this->page->ID) . "' $spamfilter $unmoderatedfilter", "Created DESC", "", $limit); $comments = DataObject::get("PageComment", "\"ParentID\" = '" . Convert::raw2sql($this->page->ID) . "' $spamfilter $unmoderatedfilter", '"Created" DESC', "", $limit);
if(is_null($comments)) { if(is_null($comments)) {
return; return;

4
tests/CMSMainTest.php
View File

@ -51,10 +51,10 @@ class CMSMainTest extends SapphireTest {
$page->Title = "Test $class page"; $page->Title = "Test $class page";
$page->write(); $page->write();
$this->assertEquals("Test $class page", DB::query("SELECT Title FROM SiteTree WHERE ID = $page->ID")->value()); $this->assertEquals("Test $class page", DB::query("SELECT \"Title\" FROM \"SiteTree\" WHERE \"ID\" = $page->ID")->value());
$page->doPublish(); $page->doPublish();
$this->assertEquals("Test $class page", DB::query("SELECT Title FROM SiteTree_Live WHERE ID = $page->ID")->value()); $this->assertEquals("Test $class page", DB::query("SELECT \"Title\" FROM \"SiteTree_Live\" WHERE \"ID\" = $page->ID")->value());
// Check that you can visit the page // Check that you can visit the page
Director::test($page->Link()); Director::test($page->Link());