Changeset 9739

Show
Ignore:
Timestamp:
03/17/11 00:52:09 (2 years ago)
Author:
patdenice
Message:

Compatible 2.2

Location:
extensions/FCKEditor
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • extensions/FCKEditor/fckeditor.php

    r9607 r9739  
    4949    // Additional pages 
    5050    if ($section == 'AdditionalPages/admin/add_page.php' 
    51       or ($section == 'AdditionalPages/admin/admin.php' and (@in_array($_GET['tab'], array('add_page', 'edit_page')))) 
     51      or (preg_match('#AdditionalPages/(?:admin/|)admin.php#', $section) and (@in_array($_GET['tab'], array('add_page', 'edit_page')))) 
    5252    ) 
    5353    { 
    … …  
    5959    // PWG Stuffs 
    6060    elseif (($section == 'PWG_Stuffs/admin/add_module.php' and @$_GET['type'] == 'Personal') 
    61       or ($section == 'PWG_Stuffs/admin/admin.php' and @in_array($_GET['tab'], array('edit_module', 'add_module'))) 
     61      or (preg_match('#PWG_Stuffs/(?:admin/|)admin.php#', $section) and @in_array($_GET['tab'], array('edit_module', 'add_module'))) 
    6262    ) 
    6363    { 

  • extensions/FCKEditor/fckeditor.tpl

    r4630 r9739  
    1 {known_script id="ckeditor" src=$FCK_PATH|@cat:"ckeditor/ckeditor.js"} 
    21{html_head} 
    32<style type="text/css"> 
    … …  
    65</style> 
    76 
     7<script type="text/javascript" src="plugins/FCKEditor/ckeditor/ckeditor.js"></script> 
    88<script type="text/javascript"> 
    99{if $FCK_TOOLBAR == 'Basic'}