Rebase and merge upstream

This commit is contained in:
Morven Lewis-Everley 2014-10-24 10:24:56 +01:00
commit 6d7a1345c0

View File

@ -320,6 +320,7 @@ class BlogHolder_Controller extends BlogTree_Controller {
$oldMode = Versioned::get_reading_mode(); $oldMode = Versioned::get_reading_mode();
Versioned::reading_stage('Stage'); Versioned::reading_stage('Stage');
$blogentry->write(); $blogentry->write();
$blogentry->writeToStage("Stage");
$blogentry->publish("Stage", "Live"); $blogentry->publish("Stage", "Live");
Versioned::set_reading_mode($oldMode); Versioned::set_reading_mode($oldMode);