openrat-cms

commit 7c09aad339e8ade768ad1b2523d07f18fc8f3686
parent 1dc9ab652f5e91e2f9629fb2cea89e803ce0fdaf
Author: dankert <devnull@localhost>
Date:   Sat, 25 Dec 2010 23:14:07 +0100

Fix: Kein Menü-Fehler, wenn Objekt nicht vorhanden.

Diffstat:
actionClasses/LanguageAction.class.php
 | 
2
+-
actionClasses/ModelAction.class.php
 | 
1
+

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/actionClasses/LanguageAction.class.php b/actionClasses/LanguageAction.class.php
@@ -271,8 +271,8 @@ class LanguageAction extends Action
 				return
 					!readonly()                          && 
 					$this->userIsAdmin()                 &&
-					count( $this->language->getAll() ) >= 2 &&
 					isset($this->language) &&
+					count( $this->language->getAll() ) >= 2 &&
 					$actLanguage->languageid != $this->language->languageid;
 				
 			case 'add':
diff --git a/actionClasses/ModelAction.class.php b/actionClasses/ModelAction.class.php
@@ -210,6 +210,7 @@ class ModelAction extends Action
 				return
 					!readonly()                          && 
 					$this->userIsAdmin()                 &&
+					is_object($this->model)              &&
 					count( $this->model->getAll() ) >= 2 &&
 					$actModel->modelid != $this->model->modelid;