1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-14 02:24:08 +02:00

Fix for TinyMce image resize. Also disabled static URLs in the admin area.

This commit is contained in:
Cameron
2018-01-26 14:10:15 -08:00
parent 318a849b77
commit 4d3ef86bb7
4 changed files with 21 additions and 15 deletions

View File

@@ -2628,7 +2628,7 @@ class e_parse extends e_parser
*/
public function staticUrl($path=null)
{
if(!defined('e_HTTP_STATIC'))
if(!defined('e_HTTP_STATIC') || deftrue('e_ADMIN_AREA'))
{
// e107::getDebug()->log("e_HTTP_STATIC not defined");
return ($path === null) ? e_HTTP : $path;
@@ -5466,7 +5466,7 @@ class e_emotefilter
return;
}
$base = defined('e_HTTP_STATIC') && is_string(e_HTTP_STATIC) ? e_HTTP_STATIC : SITEURLBASE;
$base = defined('e_HTTP_STATIC') && is_string(e_HTTP_STATIC) ? e_HTTP_STATIC : SITEURLBASE;
foreach($this->emotes as $key => $value)
{