diff options
| -rw-r--r-- | include/enotify.php | 8 | ||||
| -rw-r--r-- | library/readmore.js/readmore.js | 16 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 11 insertions, 15 deletions
diff --git a/include/enotify.php b/include/enotify.php index 3fef3ba0a..6fc771c58 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -421,6 +421,14 @@ function notification($params) { logger('notification: sending notification email'); + $hn = get_pconfig($recip['channel_id'],'system','email_notify_host'); + if($hn && (! stristr(get_app()->get_hostname(),$hn))) { + // this isn't the email notification host + pop_lang(); + return; + } + + $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"), array( "", "\n"), $body))),ENT_QUOTES,'UTF-8')); diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index 714e64fe7..e790ceb76 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -61,18 +61,12 @@ } function setBoxHeights(element) { - var el = element.clone().css({ - height: 'auto', - width: element.width(), - maxHeight: 'none', - overflow: 'hidden' - }).insertAfter(element), + var el = element, expandedHeight = el.outerHeight(), cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), defaultHeight = element.data('defaultHeight'); - el.remove(); - +console.log("el height: " + expandedHeight); var collapsedHeight = element.data('collapsedHeight') || defaultHeight; if (!cssMaxHeight) { @@ -206,10 +200,6 @@ } } }); - - window.addEventListener('resize', function() { - resizeBoxes(); - }); }, toggle: function(trigger, element, event) { @@ -225,8 +215,6 @@ element = this.element; } - setBoxHeights($(element)); // Workaroud for problems with collapse - var $this = this, $element = $(element), newHeight = '', diff --git a/version.inc b/version.inc index 7eb391e00..af10d3daf 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-01-14.918 +2015-01-15.919 |