mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Issue #2584 - Bootstrap Snippets path.

Browse Source
This commit is contained in:
Cameron
2017-04-29 14:14:23 -07:00
parent c6a593742b
commit b5096a3384
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -935,7 +935,17 @@ class wysiwyg
$customPath = THEME."templates/tinymce/snippets"; $customPath = THEME."templates/tinymce/snippets";
$path = is_dir($customPath) ? $customPath : e_PLUGIN."tinymce4/snippets"; if(is_dir($customPath))
{
$path = $customPath;
$base = THEME_ABS."templates/tinymce/snippets";
}
else
{
$path = e_PLUGIN."tinymce4/snippets";
$base = e_PLUGIN_ABS."tinymce4/snippets";
}
$files = e107::getFile()->get_files($path); $files = e107::getFile()->get_files($path);
@@ -948,7 +958,8 @@ class wysiwyg
if(!empty($m[1])) if(!empty($m[1]))
{ {
// $url = e_PLUGIN_ABS."tinymce4/snippets/".$f['fname']; // $url = e_PLUGIN_ABS."tinymce4/snippets/".$f['fname'];
$url =$path."/".$f['fname'];
$url = $base."/".$f['fname'];
$ret[] = array('title'=>trim($m[1]), 'url'=>$url, 'description'=>trim($m[2])); $ret[] = array('title'=>trim($m[1]), 'url'=>$url, 'description'=>trim($m[2]));
} }
} }