From ce97f5ff264aa34e74a98bae3ff23678a1ddde75 Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Sun, 5 May 2013 08:42:48 -0700 Subject: There is no $g2_album_id here I assume this should be $g2_album->getId() instead --- modules/g2_import/helpers/g2_import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3 From f2def7778df20041d1d94a6eda40074f77c54872 Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Sun, 5 May 2013 08:46:46 -0700 Subject: valid::url() only takes 1 arg --- system/helpers/remote.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 0c2d2b25fa7eb738d0a7491a793b2539a2dc4721 Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Sun, 5 May 2013 08:49:44 -0700 Subject: How did this ever work? :) --- system/libraries/drivers/Cache/Xcache.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 { -- cgit v1.2.3