Merge branch 'master' of github.com:s9y/additional_plugins

This commit is contained in:
Garvin Hicking 2011-12-16 12:53:37 +01:00
commit ae5a450ffb
2 changed files with 9 additions and 1 deletions

View file

@ -1,5 +1,9 @@
# $Id: ChangeLog,v 1.45 2011/03/31 11:44:44 garvinhicking Exp $ # $Id: ChangeLog,v 1.45 2011/03/31 11:44:44 garvinhicking Exp $
Version 1.55: (brockhaus)
------------------------------------------------------------------------
* Twitter and identica where not fetched correctly if fetched first.
Version 1.54: Version 1.54:
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Made PLUGIN_GRAVATAR_SUPPORTED recognize %s as variable for * Made PLUGIN_GRAVATAR_SUPPORTED recognize %s as variable for

View file

@ -14,7 +14,7 @@ if (file_exists($probelang)) {
include dirname(__FILE__) . '/lang_en.inc.php'; include dirname(__FILE__) . '/lang_en.inc.php';
// Actual version of this plugin // Actual version of this plugin
@define('PLUGIN_EVENT_GRAVATAR_VERSION', '1.53'); @define('PLUGIN_EVENT_GRAVATAR_VERSION', '1.55');
// Defines the maximum available method slots in the configuration. // Defines the maximum available method slots in the configuration.
@define('PLUGIN_EVENT_GRAVATAR_METHOD_MAX', 6); @define('PLUGIN_EVENT_GRAVATAR_METHOD_MAX', 6);
@ -835,6 +835,8 @@ class serendipity_event_gravatar extends serendipity_event
} }
function fetchTwitter(&$eventData) { function fetchTwitter(&$eventData) {
require_once S9Y_PEAR_PATH . 'HTTP/Request.php';
// Was lastrun successfull? // Was lastrun successfull?
if (isset($this->avatarConfiguration['twitter_found']) && !$this->avatarConfiguration['twitter_found']) { if (isset($this->avatarConfiguration['twitter_found']) && !$this->avatarConfiguration['twitter_found']) {
return false; return false;
@ -891,6 +893,8 @@ class serendipity_event_gravatar extends serendipity_event
} }
function fetchIdentica(&$eventData) { function fetchIdentica(&$eventData) {
require_once S9Y_PEAR_PATH . 'HTTP/Request.php';
// Was lastrun successfull? // Was lastrun successfull?
if (isset($this->avatarConfiguration['identica_found']) && !$this->avatarConfiguration['identica_found']) { if (isset($this->avatarConfiguration['identica_found']) && !$this->avatarConfiguration['identica_found']) {
return false; return false;