mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 07:36:32 +02:00
Code Issues Releases Wiki Activity

Issue #624, Fixes #625 - TinyMce image paths issue.

Browse Source
This commit is contained in:
Cameron
2014-06-12 15:21:26 -07:00
parent e276754313
commit ba72b740c2
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_plugins/gallery/e_header.php
View File

@@ -11,6 +11,11 @@ if (!defined('e107_INIT')) { exit; }
//e107::css('gallery', 'jslib/lightbox/css/lightbox.css','jquery'); //e107::css('gallery', 'jslib/lightbox/css/lightbox.css','jquery');
// See: http://www.no-margin-for-errors.com/projects/prettyPhoto-jquery-lightbox-clone // See: http://www.no-margin-for-errors.com/projects/prettyPhoto-jquery-lightbox-clone
if(USER_AREA)
{
e107::js('gallery', 'jslib/prettyPhoto/js/jquery.prettyPhoto.js','jquery'); e107::js('gallery', 'jslib/prettyPhoto/js/jquery.prettyPhoto.js','jquery');
e107::css('gallery', 'jslib/prettyPhoto/css/prettyPhoto.css','jquery'); e107::css('gallery', 'jslib/prettyPhoto/css/prettyPhoto.css','jquery');
@@ -91,6 +96,6 @@ $(document).ready(function()
unset($gp); unset($gp);
}
?> ?>

9
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -240,7 +240,14 @@ class wysiwyg
$this->config['convert_fonts_to_spans'] = false; $this->config['convert_fonts_to_spans'] = false;
$this->config['content_css'] = 'http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css'; $this->config['content_css'] = 'http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css';
$this->config['relative_urls'] = false; //Media Manager prefers it like this.
$this->config['preformatted'] = true;
$this->config['document_base_url'] = SITEURL;
// $this->config['verify_css_classes'] = 'false';
return; return;
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------