aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Hannud Abdo <abdo@member.fsf.org>2015-05-22 10:27:17 -0300
committerAlexandre Hannud Abdo <abdo@member.fsf.org>2015-05-22 10:27:17 -0300
commit760f17b17389eafafcb1ce2e3a031c19932cff7f (patch)
tree0eb9275b9d7ba977e25efa7523aca25e5f3265a6
parent81d94dae2c5f986a5d5784f66b378d6320de2c07 (diff)
downloadvolse-hubzilla-760f17b17389eafafcb1ce2e3a031c19932cff7f.tar.gz
volse-hubzilla-760f17b17389eafafcb1ce2e3a031c19932cff7f.tar.bz2
volse-hubzilla-760f17b17389eafafcb1ce2e3a031c19932cff7f.zip
Import security only when necessary, use correct variable in log
Just some cleanup, seemed like the intent of previous changes was so
-rwxr-xr-xinclude/items.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php
index 3936f1a6f..0f0f1a234 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4389,8 +4389,6 @@ function zot_feed($uid,$observer_hash,$arr) {
$mindate = null;
$message_id = null;
- require_once('include/security.php');
-
if(array_key_exists('mindate',$arr)) {
$mindate = datetime_convert('UTC','UTC',$arr['mindate']);
}
@@ -4404,7 +4402,7 @@ function zot_feed($uid,$observer_hash,$arr) {
$mindate = dbesc($mindate);
- logger('zot_feed: requested for uid ' . $uid . ' from observer ' . $observer_xchan, LOGGER_DEBUG);
+ logger('zot_feed: requested for uid ' . $uid . ' from observer ' . $observer_hash, LOGGER_DEBUG);
if($message_id)
logger('message_id: ' . $message_id,LOGGER_DEBUG);