summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/g2_import/helpers/g2_import.php2
-rw-r--r--system/helpers/remote.php2
-rw-r--r--system/libraries/drivers/Cache/Xcache.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index b155a88a..82850e85 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -498,7 +498,7 @@ class g2_import_Core {
$album->description = self::_decode_html_special_chars(self::extract_description($g2_album));
$album->owner_id = self::map($g2_album->getOwnerId());
try {
- $album->view_count = (int) g2(GalleryCoreApi::fetchItemViewCount($g2_album_id));
+ $album->view_count = (int) g2(GalleryCoreApi::fetchItemViewCount($g2_album->getId()));
} catch (Exception $e) {
// @todo log
$album->view_count = 0;
diff --git a/system/helpers/remote.php b/system/helpers/remote.php
index d34899ec..e6edb9c5 100644
--- a/system/helpers/remote.php
+++ b/system/helpers/remote.php
@@ -11,7 +11,7 @@ class remote_Core {
public static function status($url)
{
- if ( ! valid::url($url, 'http'))
+ if ( ! valid::url($url))
return FALSE;
// Get the hostname and path
diff --git a/system/libraries/drivers/Cache/Xcache.php b/system/libraries/drivers/Cache/Xcache.php
index 4c08405e..67619833 100644
--- a/system/libraries/drivers/Cache/Xcache.php
+++ b/system/libraries/drivers/Cache/Xcache.php
@@ -48,9 +48,9 @@ class Cache_Xcache_Driver extends Cache_Driver {
foreach ($keys as $key)
{
- if (xcache_isset($id))
+ if (xcache_isset($key))
{
- $items[$key] = xcache_get($id);
+ $items[$key] = xcache_get($key);
}
else
{