summaryrefslogtreecommitdiff
path: root/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-12-03 12:51:21 -0800
committerZach Copley <zach@status.net>2009-12-03 12:51:21 -0800
commitbf4ed35a90d5cc906dbae7c097551fb3a10f14d6 (patch)
tree6e4e4c172865c81ca8bc05672cd5e5f9256fc0fb /plugins/TwitterBridge/daemons/twitterstatusfetcher.php
parent7ed3328c47ee9aac1d7663bce0c6c6349f7b2570 (diff)
parent9e0f89ba4ff1695c0137faa89c08f8b5c60050ac (diff)
Merge branch '0.9.x'
* 0.9.x: (141 commits) Reload the admin design panel page to show the new CSS when the Only pick up new default site colors if the theme has NOT changed. Delete design when user chooses to restore default design, instead Localisation updates for !StatusNet from !translatewiki.net !sntrans Do not rebuild/add .mo files by default If an XHR notice is sent form a page that has no timeline, show a Revert "If the page doesn't have .notices, silently skip the notice XHR response" Revert "Clear/reset the XHR notice form on pages where there is no timeline" Clear/reset the XHR notice form on pages where there is no timeline If the page doesn't have .notices, silently skip the notice XHR response Remove useless debugging statement Moved form control styles (i.e., border and radius) out of base add pluginhandler to list of daemons to shut down Using box-shadow only on the current navigation item Updated theme readme Fix regression in password settings: users have been unable to change their passwords since introduction of ChangePassword event (later StartChangePassword) November 5 in commit d6ddb84132d7b9510ba82064c67f2a39822dab49 Ticket 2048: make OMB posting HTTP timeout configurable as $config['omb']['timeout']; defaults to 5 seconds instead of 20-second default in Yadis library ticket 1100: add Drupal source link Fix makefile wildcards for locale compilation (now works on Ubuntu 8.04) typo fix: '$this' now spelled correctly. Looks like this'll fix acceptance of 'source' param for direct messages posted to API ... Conflicts: js/util.js locale/ar/LC_MESSAGES/statusnet.po locale/bg/LC_MESSAGES/statusnet.po locale/ca/LC_MESSAGES/statusnet.po locale/cs/LC_MESSAGES/statusnet.po locale/de/LC_MESSAGES/statusnet.po locale/el/LC_MESSAGES/statusnet.po locale/en_GB/LC_MESSAGES/statusnet.po locale/es/LC_MESSAGES/statusnet.po locale/fi/LC_MESSAGES/statusnet.po locale/fr/LC_MESSAGES/statusnet.po locale/ga/LC_MESSAGES/statusnet.po locale/he/LC_MESSAGES/statusnet.po locale/is/LC_MESSAGES/statusnet.po locale/it/LC_MESSAGES/statusnet.po locale/ja/LC_MESSAGES/statusnet.po locale/ko/LC_MESSAGES/statusnet.po locale/mk/LC_MESSAGES/statusnet.po locale/nb/LC_MESSAGES/statusnet.po locale/nl/LC_MESSAGES/statusnet.po locale/nn/LC_MESSAGES/statusnet.po locale/pl/LC_MESSAGES/statusnet.po locale/pt/LC_MESSAGES/statusnet.po locale/pt_BR/LC_MESSAGES/statusnet.po locale/ru/LC_MESSAGES/statusnet.po locale/statusnet.po locale/sv/LC_MESSAGES/statusnet.po locale/te/LC_MESSAGES/statusnet.po locale/tr/LC_MESSAGES/statusnet.po locale/uk/LC_MESSAGES/statusnet.po locale/vi/LC_MESSAGES/statusnet.po locale/zh_CN/LC_MESSAGES/statusnet.po locale/zh_TW/LC_MESSAGES/statusnet.po plugins/Realtime/realtimeupdate.js
Diffstat (limited to 'plugins/TwitterBridge/daemons/twitterstatusfetcher.php')
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterstatusfetcher.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index b5428316b..eba1d563b 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -109,7 +109,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$flink->find();
$flinks = array();
- common_log(LOG_INFO, "hello");
while ($flink->fetch()) {