From 2300d776ebefbcf3f2962239b1fae317d31b6a4a Mon Sep 17 00:00:00 2001
From: Christian Fowler <cfowler@einstein>
Date: Fri, 30 Jan 2015 19:20:22 -0500
Subject: move distro to ckeditor subdirectory

---
 admin/admin_ckeditor_inc.php | 8 +++++++-
 bit_setup_inc.php            | 4 ++--
 templates/footer_inc.tpl     | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/admin/admin_ckeditor_inc.php b/admin/admin_ckeditor_inc.php
index df124c6..cfecafb 100644
--- a/admin/admin_ckeditor_inc.php
+++ b/admin/admin_ckeditor_inc.php
@@ -42,7 +42,13 @@ $formSkin = array( 'ckedit_skin' => array(
 		)
 );
 $gBitSmarty->assign( 'formSkin', $formSkin );
-$gBitSmarty->assign( 'formSkinChoices', array('bw_basic', 'moono', 'kama', 'office2003', 'v2'));
+$skins = array_flip( scandir( CKEDITOR_PKG_PATH.'ckeditor/skins/' ) );
+foreach( array( '.', '..' ) as $dir ) {
+	if( isset( $skins[$dir] ) ) {
+		unset( $skins[$dir] );
+	}
+}
+$gBitSmarty->assign( 'formSkinChoices', array_keys( $skins ) );
 
 
 if( !empty( $_REQUEST['change_prefs'] ) ) {
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 5ab810f..66fe74b 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -10,8 +10,8 @@ $gBitSystem->registerPackage( $registerHash );
 
 if( $gBitSystem->isPackageActive( 'ckeditor' ) && $gBitUser->hasPermission( 'p_liberty_enter_html' ) ){
 	if( defined( 'IS_LIVE' ) && IS_LIVE ) {
-		$gBitThemes->loadJavascript( CKEDITOR_PKG_PATH.'ckeditor.js', FALSE, 600, FALSE );
+		$gBitThemes->loadJavascript( CKEDITOR_PKG_PATH.'ckeditor/ckeditor.js', FALSE, 600, FALSE );
 	} else {
-		$gBitThemes->loadJavascript( CKEDITOR_PKG_PATH.'ckeditor.js', FALSE, 600, FALSE );
+		$gBitThemes->loadJavascript( CKEDITOR_PKG_PATH.'ckeditor/ckeditor.js', FALSE, 600, FALSE );
 	}
 }
diff --git a/templates/footer_inc.tpl b/templates/footer_inc.tpl
index 0386bed..7562bd2 100644
--- a/templates/footer_inc.tpl
+++ b/templates/footer_inc.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $wysiwygEdit = 'true'}
+{if $wysiwygEdit == 'true'}
 	<script>
     	CKEDITOR.replace( '{$smarty.const.LIBERTY_TEXT_AREA}', {
 			toolbarGroups: [
-- 
cgit v1.3