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

Merge pull request #3145 from tractorcow/pulls/3.1/fix-choose-stage

Browse Source 
BUG Fix access to protected Session::current_session()
This commit is contained in:
Simon Welsh 2014-05-24 11:07:40 +10:00
commit 9b3bfb2e10
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
model/Versioned.php
View File

@ -939,23 +939,28 @@ class Versioned extends DataExtension implements TemplateGlobalProvider {
* @param Session $session Optional session within which to store the resulting stage * @param Session $session Optional session within which to store the resulting stage
*/ */
public static function choose_site_stage($session = null) { public static function choose_site_stage($session = null) {
if(!$session) $session = Session::current_session(); // Default to Live
$mode = 'Stage.Live';
// Get reading mode
if(isset($_GET['stage'])) { if(isset($_GET['stage'])) {
$stage = ucfirst(strtolower($_GET['stage'])); $stage = ucfirst(strtolower($_GET['stage']));
if(!in_array($stage, array('Stage', 'Live'))) $stage = 'Live'; if(!in_array($stage, array('Stage', 'Live'))) $stage = 'Live';
$mode = 'Stage.' . $stage;
$session->inst_set('readingMode', 'Stage.' . $stage); } elseif (isset($_GET['archiveDate']) && strtotime($_GET['archiveDate'])) {
} $mode = 'Archive.' . $_GET['archiveDate'];
if(isset($_GET['archiveDate']) && strtotime($_GET['archiveDate'])) { } elseif($session) {
$session->inst_set('readingMode', 'Archive.' . $_GET['archiveDate']); $mode = $session->inst_get('readingMode') ?: $mode;
} else {
$mode = Session::get('readingMode') ?: $mode;
} }
if($mode = $session->inst_get('readingMode')) { // Save reading mode
Versioned::set_reading_mode($mode); Versioned::set_reading_mode($mode);
if($session) {
$session->inst_set('readingMode', $mode);
} else { } else {
Versioned::reading_stage("Live"); Session::set('readingMode', $mode);
} }
if(!headers_sent() && !Director::is_cli()) { if(!headers_sent() && !Director::is_cli()) {

11
tests/model/VersionedTest.php
View File

@ -439,7 +439,6 @@ class VersionedTest extends SapphireTest {
$testData->Content = 'After Content'; $testData->Content = 'After Content';
$testData->write(); $testData->write();
$_GET['archiveDate'] = '2009-01-01 19:00:00';
Versioned::reading_archived_date('2009-01-01 19:00:00'); Versioned::reading_archived_date('2009-01-01 19:00:00');
$fetchedData = VersionedTest_DataObject::get()->byId($id); $fetchedData = VersionedTest_DataObject::get()->byId($id);
@ -568,6 +567,16 @@ class VersionedTest extends SapphireTest {
'Check that subsequent requests in the same session remain in Live mode' 'Check that subsequent requests in the same session remain in Live mode'
); );
// Test choose_site_stage
Session::set('readingMode', 'Stage.Stage');
Versioned::choose_site_stage();
$this->assertEquals('Stage.Stage', Versioned::get_reading_mode());
Session::set('readingMode', 'Archive.2014-01-01');
Versioned::choose_site_stage();
$this->assertEquals('Archive.2014-01-01', Versioned::get_reading_mode());
Session::clear('readingMode');
Versioned::choose_site_stage();
$this->assertEquals('Stage.Live', Versioned::get_reading_mode());
} }
} }