diff --git a/fields/version.php b/fields/version.php
index 03ef257..cb6bee0 100644
--- a/fields/version.php
+++ b/fields/version.php
@@ -89,7 +89,6 @@ protected function getLabel()
$update = $data->$stability;
}
-
// Message containing the version
if (version_compare(JVERSION, '3.0', 'ge'))
{
@@ -109,11 +108,13 @@ protected function getLabel()
{
$message .= ' ' . JText::_('MOD_TWEETDISPLAYBACK_VERSION_FAILED') . $close;
}
+
// If an update is available, and compatible with the current Joomla! version, notify the user
elseif (version_compare($update->version, $version, 'gt') && version_compare(JVERSION, $update->jversion, 'ge'))
{
$message .= ' ' . JText::sprintf('MOD_TWEETDISPLAYBACK_VERSION_UPDATE', $update->version) . '';
}
+
// No updates, or the Joomla! version is not compatible, so let the user know they're using the current version
else
{
diff --git a/helper.php b/helper.php
index 98725da..4e8533b 100644
--- a/helper.php
+++ b/helper.php
@@ -259,6 +259,7 @@ public function compileData()
return $this->twitter;
}
+
// Make sure we've got an array of data
elseif (is_array($obj))
{
@@ -331,6 +332,7 @@ public function compileFromCache()
$this->twitter['error']['messages'][] = $error->message;
}
}
+
// Make sure we've got an array of data
elseif (is_array($obj))
{
@@ -402,7 +404,6 @@ public function getJSON($req)
// Render from the cached data
$this->bearer = file_get_contents($cacheFile);
}
-
}
$headers = array(
@@ -490,6 +491,7 @@ protected function prepareUser()
return;
}
+
// Check that we have the JSON, otherwise set an error
elseif (!$obj)
{
@@ -540,7 +542,7 @@ protected function prepareUser()
// Append the list name if being pulled
if ($feed == 'list')
{
- $this->twitter['header']->user .= ' - ' . $list . ' list';
+ $this->twitter['header']->user .= ' - ' . $list . ' list';
}
}
@@ -815,6 +817,7 @@ protected function processItem($o, $i)
{
$userURL = $scheme . 'twitter.com/intent/user?screen_name=' . $tweetedBy;
}
+
$this->twitter['tweets']->$i->user = '' . $tweetedBy . '' . $this->params->get('tweetUserSeparator') . '';
}
@@ -941,6 +944,7 @@ protected function processItem($o, $i)
{
$mentionURL = $scheme . 'twitter.com/intent/user?screen_name=' . $mention->screen_name;
}
+
$this->twitter['tweets']->$i->text = str_ireplace('@' . $mention->screen_name, '@' . $mention->screen_name . '', $this->twitter['tweets']->$i->text);
}