diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2013-05-24 12:12:57 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2013-05-24 12:12:57 +0000 |
| commit | 9569b43035de9645e82271896e302c8d082d960a (patch) | |
| tree | 4dffbc9117e84d5fb9cf0a5806bf51ff2086ee95 /system | |
| parent | 3908e37d965fa76ea774e76ddf42365a872a5f27 (diff) | |
| parent | b7177cfb2dcfb8b057a15757943c5e733d6c8917 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'system')
| -rw-r--r-- | system/helpers/remote.php | 2 | ||||
| -rw-r--r-- | system/libraries/drivers/Cache/Xcache.php | 4 |
2 files changed, 3 insertions, 3 deletions
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 { |