Changeset 9739

Timestamp:

Mar 17, 2011, 12:52:09 AM (13 years ago)

Author:

patdenice

Message:

Compatible 2.2

Location:

extensions/FCKEditor

Files:

• fckeditor.php (modified) (2 diffs)
• fckeditor.tpl (modified) (2 diffs)

extensions/FCKEditor/fckeditor.php

@@ -49 +49 @@
     // Additional pages
     if ($section == 'AdditionalPages/admin/add_page.php'
-      or ($section == 'AdditionalPages/admin/admin.php' and (@in_array($_GET['tab'], array('add_page', 'edit_page'))))
+      or (preg_match('#AdditionalPages/(?:admin/|)admin.php#', $section) and (@in_array($_GET['tab'], array('add_page', 'edit_page'))))
     )
     {
@@ -59 +59 @@
     // PWG Stuffs
     elseif (($section == 'PWG_Stuffs/admin/add_module.php' and @$_GET['type'] == 'Personal')
-      or ($section == 'PWG_Stuffs/admin/admin.php' and @in_array($_GET['tab'], array('edit_module', 'add_module')))
+      or (preg_match('#PWG_Stuffs/(?:admin/|)admin.php#', $section) and @in_array($_GET['tab'], array('edit_module', 'add_module')))
     )
     {

extensions/FCKEditor/fckeditor.tpl

@@ -1 @@
-{known_script id="ckeditor" src=$FCK_PATH|@cat:"ckeditor/ckeditor.js"}
 {html_head}
 <style type="text/css">
@@ -6 +5 @@
 </style>
 
+<script type="text/javascript" src="plugins/FCKEditor/ckeditor/ckeditor.js"></script>
 <script type="text/javascript">
 {if $FCK_TOOLBAR == 'Basic'}