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

BUGFIX: Fix virtual pages not returning correct content (from r98520)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102762 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-14 02:17:29 +00:00
parent 394cddb4e6
commit 9f2f88fb28
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/model/VirtualPage.php
View File

@ -226,6 +226,8 @@ class VirtualPage extends Page {
$return = $this->copyContentFrom()->$funcName(); $return = $this->copyContentFrom()->$funcName();
} else if($this->copyContentFrom()->hasField($field)) { } else if($this->copyContentFrom()->hasField($field)) {
$return = $this->copyContentFrom()->getField($field); $return = $this->copyContentFrom()->getField($field);
} else if($field == 'Content') {
return '<p>' . _t('VirtualPage.NOTFOUND', 'We could not find the content for this virtual page.') . '</p>';
} }
} }
@ -261,13 +263,6 @@ class VirtualPage extends Page {
if (!$haveIt) $haveIt = $this->copyContentFrom()->hasMethod($method); if (!$haveIt) $haveIt = $this->copyContentFrom()->hasMethod($method);
return $haveIt; return $haveIt;
} }
/**
* If we ever get this far, it means that the VP failed.
*/
function Content() {
return '<p>'._t('VirtualPage.NOTFOUND', 'We could not find the content for this virtual page.').'</p>';
}
} }
/** /**