openrat-cms

commit c035b0198a93a59cadd19db2b53a867cc0f20f98
parent bab9bc3eac1b9998343f76940538c95e2eb6dee6
Author: Jan Dankert <devnull@localhost>
Date:   Tue, 30 Oct 2012 23:16:33 +0100

Fix für Filebrowser.

Diffstat:
M
action/FilebrowserAction.class.php
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/action/FilebrowserAction.class.php b/action/FilebrowserAction.class.php
@@ -121,7 +121,9 @@ class FilebrowserAction extends ObjectAction
 		if   ( ! $this->folder->isRoot )
 			$this->setTemplateVar('up_url',Html::url('filebrowser','browse',$this->folder->parentid,array('CKEditorFuncNum'=>$funcNum)));
 
+		$user = Session::getUser();
 		$this->setTemplateVar('writable',$this->folder->hasRight(ACL_WRITE) );
+		$this->setTemplateVar('style',$user->style );
 		
 		$list = array();
 
@@ -146,7 +148,7 @@ class FilebrowserAction extends ObjectAction
 				if	( $o->isFolder )
 					$list[$id]['url' ] = Html::url('filebrowser','browse',$id,array('CKEditorFuncNum'=>$funcNum) );
 				else
-					$list[$id]['url' ] = "javascript:window.top.opener.CKEDITOR.tools.callFunction($funcNum,'".Html::url('file','preview',$id,array('oid'=>'__OID__'.$id.'__'))."','');window.top.close();window.top.opener.focus();";					
+					$list[$id]['url' ] = "javascript:window.top.opener.CKEDITOR.tools.callFunction($funcNum,'".Html::url('file','show',$id,array('oid'=>'__OID__'.$id.'__'))."','');window.top.close();window.top.opener.focus();";