From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 19 Jun 2009 06:25:27 +0000 (-0700)
Subject: Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=45430d2b3b952dda31d232c2726e5980a7e6e56a;p=quix0rs-gnu-social.git

Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
---

45430d2b3b952dda31d232c2726e5980a7e6e56a
diff --cc scripts/twitterstatusfetcher.php
index d332fb5554,88605c3491..20f42cef85
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@@ -35,32 -35,16 +35,35 @@@ define('POLL_INTERVAL', 60); // in seco
  // Uncomment this to get useful logging
  define('SCRIPT_DEBUG', true);
  
 -require_once(INSTALLDIR . '/lib/common.php');
 -require_once(INSTALLDIR . '/lib/daemon.php');
 +require_once INSTALLDIR . '/lib/common.php';
 +require_once INSTALLDIR . '/lib/daemon.php';
 +
 +/**
 + * Fetcher for statuses from Twitter
 + *
 + * Fetches statuses from Twitter and inserts them as notices in local
 + * system.
 + *
 + * @category Twitter
 + * @package  Laconica
 + * @author   Zach Copley <zach@controlyourself.ca>
 + * @author   Evan Prodromou <evan@controlyourself.ca>
 + * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
 + * @link     http://laconi.ca/
 + */
  
+ // NOTE: an Avatar path MUST be set in config.php for this
+ // script to work: e.g.: $config['avatar']['path'] = '/laconica/avatar';
+ 
  class TwitterStatusFetcher extends Daemon
  {
 +    private $_children = array();
  
 -    private $children = array();
 +    /**
 +     * Name of this daemon
 +     *
 +     * @return string Name of the daemon.
 +     */
  
      function name()
      {