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

BUGFIX Fixed permissions in CMSMain->revert() - only needs edit permissions, not publish permissions

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69442 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-12-18 02:46:16 +00:00 committed by Sam Minnee
parent b503041f09
commit 4ed5760c90
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/CMSMain.php
View File

@ -569,12 +569,20 @@ JS;
$record->doPublish(); $record->doPublish();
} }
/**
* Reverts a page by publishing it to live.
* Use {@link restorepage()} if you want to restore a page
* which was deleted from draft without publishing.
*
* @uses SiteTree->doRevertToLive()
*/
public function revert($urlParams, $form) { public function revert($urlParams, $form) {
$id = $_REQUEST['ID']; $id = $_REQUEST['ID'];
$record = DataObject::get_by_id("SiteTree", $id); $record = DataObject::get_by_id("SiteTree", $id);
// if the user can't publish, he shouldn't be able to revert a page (and hence copy the last stored revision to the live site) // a user can restore a page without publication rights, as it just adds a new draft state
if($record && !$record->canPublish()) return Security::permissionFailure($this); // (this action should just be available when page has been "deleted from draft")
if($record && !$record->canEdit()) return Security::permissionFailure($this);
$record->doRevertToLive(); $record->doRevertToLive();
@ -1167,10 +1175,16 @@ JS;
return $response; return $response;
} }
/**
* Restore a previously deleted page.
* Internal action which shouldn't be executed through URL-handlers.
*/
function restorepage() { function restorepage() {
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 no record can be found on draft stage (meaning it has been "deleted from draft" before),
// create an empty record
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");
} }