diff --git a/inc/FeedParser.php b/inc/FeedParser.php
index b98350da7bee27b6c7b20656ff69e8c16448d15b..235bed46e694f761720bce19f381b864b172bd30 100644
--- a/inc/FeedParser.php
+++ b/inc/FeedParser.php
@@ -49,7 +49,7 @@ class FeedParser_File extends SimplePie_File {
*/
function FeedParser_File($url, $timeout=10, $redirects=5,
$headers=null, $useragent=null, $force_fsockopen=false) {
- parent::__construct();
+ @parent::__construct();
$this->http = new DokuHTTPClient();
$this->success = $this->http->sendRequest($url);
diff --git a/inc/mail.php b/inc/mail.php
index 8742e17f688c81a35018650b9663bc1dda77cfa4..01b2895e11082c3e17824378389a6b680cff6d4b 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -104,6 +104,9 @@ function _mail_send_action($data) {
$headers = isset($data['headers']) ? $data['headers'] : null;
$params = isset($data['params']) ? $data['params'] : null;
+ // discard mail request if no recipients are available
+ if(trim($to) === '' && trim($cc) === '' && trim($bcc) === '') return false;
+
// end additional code to support event ... original mail_send() code from here
if(defined('MAILHEADER_ASCIIONLY')){
diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
index 62c20eb0f2feef17633c4d09cc199f7d7aa1c464..7cc65579ef0c959b893efd34407c40e012c2aa89 100644
--- a/lib/scripts/behaviour.js
+++ b/lib/scripts/behaviour.js
@@ -8,7 +8,6 @@
* automatically whenever a certain object is in the DOM or a certain CSS
* class was found
*/
-
var dw_behaviour = {
init: function(){
@@ -24,9 +23,9 @@ var dw_behaviour = {
* Looks for an element with the ID scroll__here at scrolls to it
*/
scrollToMarker: function(){
- var obj = jQuery('#scroll__here');
- if(obj.length) {
- obj[0].scrollIntoView();
+ var $obj = jQuery('#scroll__here');
+ if($obj.length) {
+ $obj[0].scrollIntoView();
}
},
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index bcdba2a489cd86a277d42b67e05e79656321412a..ebbee5a78945354d09497098b1917caa9a03bebe 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -303,7 +303,7 @@
$.post(
DOKU_BASE + 'lib/exe/ajax.php',
- link.attr('search').substr(1) + '&call=medians',
+ link[0].search.substr(1) + '&call=medians',
function (data) {
ul.html(data);
listitem.append(ul);
@@ -326,7 +326,7 @@
event.preventDefault();
- jQuery.remove('div.success, div.info, div.error, div.notify');
+ jQuery('div.success, div.info, div.error, div.notify').remove();
content = $('#media__content');
content.html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
@@ -334,7 +334,7 @@
// fetch the subtree
$.post(
DOKU_BASE + 'lib/exe/ajax.php',
- link.attr('search').substr(1)+'&call=medialist',
+ link[0].search.substr(1)+'&call=medialist',
function (data) {
content.html(data);
prepare_content(content);
diff --git a/lib/styles/all.css b/lib/styles/all.css
index dd9f464626875181b4ab0890d76d8dee954c5d1e..915ced5d635369cfaa94e5ed6bec4a8256bd98b0 100644
--- a/lib/styles/all.css
+++ b/lib/styles/all.css
@@ -5,6 +5,7 @@
div.clearer {
clear: both;
+ font-size: 0;
line-height: 0;
height: 0;
overflow: hidden;
diff --git a/lib/tpl/index.php b/lib/tpl/index.php
index 20abea20caa3cc1a0598a0bcbe7da46959c15371..0273e567803fb59bf0d1dffe6432b6a912e5f21f 100644
--- a/lib/tpl/index.php
+++ b/lib/tpl/index.php
@@ -9,7 +9,7 @@
* @author Anika Henke <anika@selfthinker.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
-if(!define('NOSESSION')) define('NOSESSION',1);
+if(!defined('NOSESSION')) define('NOSESSION',1);
require_once(DOKU_INC.'inc/init.php');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"