From 2abb01e7cb42483dd0dcce39e1aa6f9189bdaac4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 10 Sep 2014 22:06:50 +0200 Subject: [PATCH] No need for php interpreter again as this script is executable. Signed-off-by: Roland Haeder --- lib/default.php | 2 +- lib/inboxnoticestream.php | 4 ++++ scripts/commandline.inc.php | 1 + scripts/startdaemons.sh | 2 +- scripts/stopdaemons.sh | 4 ++-- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/default.php b/lib/default.php index 59f3cd9985..e2cc80cb1b 100644 --- a/lib/default.php +++ b/lib/default.php @@ -131,7 +131,7 @@ $default = 'delete' => false, 'move' => true), 'image' => - array('jpegquality' => 85), + array('jpegquality' => 95), 'avatar' => array('server' => null, 'dir' => INSTALLDIR . '/avatar/', diff --git a/lib/inboxnoticestream.php b/lib/inboxnoticestream.php index 87868b1d79..0d8733e079 100644 --- a/lib/inboxnoticestream.php +++ b/lib/inboxnoticestream.php @@ -139,11 +139,13 @@ class RawInboxNoticeStream extends NoticeStream function getNotices($offset, $limit, $sinceId, $maxId) { + //common_debug('offset=' . $offset . ',limit=' . $limit . ',sinceId=' . $sinceId . ',maxId=' . $maxId . ' - CALLED!'); $all = array(); do { $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId); + //common_debug('ids()=' . count($ids)); $notices = Notice::pivotGet('id', $ids); @@ -158,8 +160,10 @@ class RawInboxNoticeStream extends NoticeStream $limit -= count($notices); } + //common_debug('all()=' . count($all)); } while (count($notices) < count($ids) && count($ids) > 0); + //common_debug('all()=' . count($all) . ' - EXIT!'); return new ArrayWrapper($all); } } diff --git a/scripts/commandline.inc.php b/scripts/commandline.inc.php index d7ee158801..0a5257cdd5 100644 --- a/scripts/commandline.inc.php +++ b/scripts/commandline.inc.php @@ -35,6 +35,7 @@ ini_set("max_execution_time", "0"); ini_set("max_input_time", "0"); set_time_limit(0); mb_internal_encoding('UTF-8'); +error_reporting(0); // Add extlib to our path so we can get Console_Getopt diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh index 2ed3528c5e..c4d86053e9 100755 --- a/scripts/startdaemons.sh +++ b/scripts/startdaemons.sh @@ -35,7 +35,7 @@ if [ $# -gt 1 ]; then fi DIR=`dirname $0` -DAEMONS=`php $DIR/getvaliddaemons.php $ARGSG` +DAEMONS=`$DIR/getvaliddaemons.php $ARGSG` for f in $DAEMONS; do diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh index 35841b64a8..b4a3725d8d 100755 --- a/scripts/stopdaemons.sh +++ b/scripts/stopdaemons.sh @@ -31,9 +31,9 @@ if [ $# -gt 0 ] ; then fi SDIR=`dirname $0` -DIR=`php $SDIR/getpiddir.php $SITE` +DIR=`$SDIR/getpiddir.php $SITE` -DAEMONS=`php $SDIR/getvaliddaemons.php` +DAEMONS=`$SDIR/getvaliddaemons.php` for f in $DAEMONS; do f=$(basename $f .php) -- 2.39.5