BUGFIX: Fixed redirection to help page bug that intermittently appears

BUGFIX: Add LeftAndMain:$url_rule to minimise bugs in modules

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66701 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-11-26 00:58:41 +00:00
parent 21fa7b24f7
commit 70ad5368cd

View File

@ -22,7 +22,7 @@ class LeftAndMain extends Controller {
static $url_segment; static $url_segment;
static $url_rule; static $url_rule = '/$Action/$ID/$OtherID';
static $menu_title; static $menu_title;
@ -275,7 +275,7 @@ class LeftAndMain extends Controller {
*/ */
public function MainMenu() { public function MainMenu() {
// Don't accidentally return a menu if you're not logged in - it's used to determine access. // Don't accidentally return a menu if you're not logged in - it's used to determine access.
if(!Member::currentUserID()) return new DataObjectSet(); if(!Member::currentUser()) return new DataObjectSet();
// Encode into DO set // Encode into DO set
$menu = new DataObjectSet(); $menu = new DataObjectSet();