Skip to content

Commit 309d86e

Browse files
versionSelector: Pass xml explicitly
Previously, this accessed `$page->xml`, but this is no longer public, so pass it explicitly.
1 parent 6dbc5fe commit 309d86e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

system/core/pages.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -608,13 +608,13 @@ function wikify_link($node) {
608608
Parameters:
609609
page - page node from hypha pagelist
610610
*/
611-
function versionSelector($page) {
612-
if ($page->xml->hasVersions()) {
611+
function versionSelector($page, $xml) {
612+
if ($xml->hasVersions()) {
613613
$_action = makeAction($page->language.'/'.$page->pagename, '', 'version');
614614
$html = __('version').': '.'<select class="version" name="version" onchange="'.$_action.'">';
615615

616616
$history = array();
617-
foreach($page->xml->getElementById($page->language)->getElementsByTagName('version') as $v) {
617+
foreach($xml->getElementById($page->language)->getElementsByTagName('version') as $v) {
618618
$timeStamp = $v->getAttribute('xml:id');
619619
$history[$timeStamp] = date('j-m-y, H:i', ltrim($timeStamp, 't')).', '.$v->getAttribute('author');
620620
}

system/datatypes/text.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected function defaultView(HyphaRequest $request) {
6464
// setup addition widgets when client is logged in
6565
if (isUser()) {
6666
// show a drop down list of revisions
67-
$this->html->writeToElement('versionList', versionSelector($this));
67+
$this->html->writeToElement('versionList', versionSelector($this, $this->xml));
6868

6969
// if a revision is selected, show a 'revert' command button
7070
if ($version) {

0 commit comments

Comments
 (0)