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

Merged revisions 50205 via svnmerge from

Browse Source 
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r50205 | sminnee | 2008-02-26 15:26:11 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  Fixed CMS bottom-navigation after publish, when using the subsites module (or other alternateAbsoluteLink implementors)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50851 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-03-11 01:20:24 +00:00
parent ae88663ee2
commit 2c1b94f355
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/CMSMain.php
View File

@ -795,11 +795,12 @@ HTML;
* - Send a status message * - Send a status message
*/ */
function tellBrowserAboutPublicationChange($page, $statusMessage) { function tellBrowserAboutPublicationChange($page, $statusMessage) {
$JS_title = Convert::raw2js($page->TreeTitle()); $JS_title = Convert::raw2js($page->TreeTitle());
$JS_stageURL = Convert::raw2js(DB::query("SELECT URLSegment FROM SiteTree WHERE ID = $page->ID")->value()); $JS_stageURL = $page->DeletedFromStage ? '' : Convert::raw2js($page->AbsoluteLink());
$JS_liveURL = Convert::raw2js(DB::query("SELECT URLSegment FROM SiteTree_Live WHERE ID = $page->ID")->value()); $liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "`SiteTree`.ID = $page->ID");
$JS_liveURL = $liveRecord ? Convert::raw2js($liveRecord->AbsoluteLink()) : '';
FormResponse::add($this->getActionUpdateJS($page)); FormResponse::add($this->getActionUpdateJS($page));
FormResponse::update_status($page->Status); FormResponse::update_status($page->Status);