Merge pull request #2326 from fabrixxm/revert_db949bb8

Revert "Updated modules to allow for partial overrides without errors"
This commit is contained in:
Michael Vogel
2016-02-09 06:55:49 +01:00
123 changed files with 471 additions and 768 deletions
+2 -4
View File
@@ -6,7 +6,6 @@ require_once('include/event.php');
require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
if(! function_exists('dfrn_notify_post')) {
function dfrn_notify_post(&$a) {
logger(__function__, LOGGER_TRACE);
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
@@ -215,9 +214,8 @@ function dfrn_notify_post(&$a) {
// NOTREACHED
}
}
if(! function_exists('dfrn_notify_content')) {
function dfrn_notify_content(&$a) {
if(x($_GET,'dfrn_id')) {
@@ -341,5 +339,5 @@ function dfrn_notify_content(&$a) {
killme();
}
}
}