openrat-cms

commit c0760088d79674aa06fd478bd0ad8e8ea8867d8c
parent 8f64b2c3cb8035f670ed32a4227c7411ab2176c7
Author: dankert <devnull@localhost>
Date:   Fri, 30 Nov 2007 00:20:31 +0100

Bugfix Sprach-Start.

Diffstat:
actionClasses/IndexAction.class.php
 | 
22
++++++++++++----------

1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/actionClasses/IndexAction.class.php b/actionClasses/IndexAction.class.php
@@ -803,16 +803,18 @@ class IndexAction extends Action
 		$this->evaluateRequestVars( array(REQ_PARAM_LANGUAGE_ID=>$this->getRequestId()) );
 
 		$user = Session::getUser();
+		$project  = Session::getProject();
+		$language = Session::getProjectLanguage();
 		$user->loadRights( $project->projectid,$language->languageid );
 		Session::setUser( $user );
 	}
 
 
-	function model()
-	{
-		$this->evaluateRequestVars( array(REQ_PARAM_MODEL_ID=>$this->getRequestId()) );
-
-		$user     = Session::getUser();
+	function model()
+	{
+		$this->evaluateRequestVars( array(REQ_PARAM_MODEL_ID=>$this->getRequestId()) );
+
+		$user     = Session::getUser();
 		$project  = Session::getProject();
 		$language = Session::getProjectLanguage();
 		$user->loadRights( $project->projectid,$language->languageid );
@@ -901,9 +903,9 @@ class IndexAction extends Action
 			}
 	
 			$object = Session::getObject();
+			$object->objectLoadRaw();
 			if	( !is_object($object) || $object->projectid != $project->projectid)
 				$object = new Object( $project->getRootObjectId() );
-			$object->objectLoadRaw();
 			Session::setObject( $object );
 		}
 		elseif	( isset($vars[REQ_PARAM_PROJECT_ID])&&Project::available($vars[REQ_PARAM_PROJECT_ID]) )
@@ -1066,11 +1068,11 @@ class IndexAction extends Action
 		$object  = Session::getObject();
 
 		$elementid = 0;
-		
+		
 		if	( is_object($object) )
-		{
-			$type = $object->getType();
-			
+		{
+			$type = $object->getType();
+			
 			if	( $type == 'page' )
 			{
 				$page        = new Page($object->objectid);