diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-05-07 10:44:34 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-05-07 10:44:34 -0700 |
| commit | f59f1c03b8e69241095d8c708d6a42edf6ed2a55 (patch) | |
| tree | 0ff420d9fe69f0ab0dc608be18a7bc4a50da759e | |
| parent | 48f9595f7806796f955fa1c2c6a3f6f17b1ed9ad (diff) | |
| parent | 0c2d2b25fa7eb738d0a7491a793b2539a2dc4721 (diff) | |
Merge pull request #352 from rlerdorf/master
Fix a couple of small mistakes
Fixes #2066 and #2067
| -rw-r--r-- | modules/g2_import/helpers/g2_import.php | 2 | ||||
| -rw-r--r-- | system/helpers/remote.php | 2 | ||||
| -rw-r--r-- | system/libraries/drivers/Cache/Xcache.php | 4 |
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 { |