Merge branch 'dev' of git@github.com:deizel/infinitas into dev

infinitas · Jan 4, 2010 · 17cab08 · 17cab08
2 parents 90c41c1 + b3f9a03
commit 17cab08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ libs/cronjobs
 infinitas.PHPEditProject
 .project
 .buildpath
-.settings/*
+.settings/*
+.vimrc.custom
diff --git a/infinitas/core/views/helpers/wysiwyg.php b/infinitas/core/views/helpers/wysiwyg.php
@@ -43,11 +43,13 @@ function fckStarter( $id = null, $toolbar = 'Basic' )
                 $did .= ucfirst( $v );
             }
 
+            $path = $this->webroot.'js/';
+
             return <<<FCK_CODE
 <script type="text/javascript">
 fckLoader_$did = function () {
     var bFCKeditor_$did = new FCKeditor('$did');
-    bFCKeditor_$did.BasePath = '/js/';
+    bFCKeditor_$did.BasePath = $path;
     bFCKeditor_$did.ToolbarSet = '$toolbar';
     bFCKeditor_$did.ReplaceTextarea();
 }