correct a couple of bugs

darcs-hash:20080922190937-5ed1f-9439cd9cff178323ac1445f33e2520260b4b267e.gz

diff --git a/classes/User.php b/classes/User.php
index 1168406ef8e327f10ddf4dfd39c01c9b8d1d95aa..fcae38c098de2afe49113534234e9265bfcaf6f1 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -149,6 +149,16 @@ class User extends DB_DataObject
        }
 
        function noticesWithFriends($offset=0, $limit=20) {
+
+               # We clearly need a more elegant way to make this work.
+               
+               if (common_config('memcached', 'enabled')) {
+                       if ($offset + $limit <= WITHFRIENDS_CACHE_WINDOW) {
+                               $cached = $this->noticesWithFriendsWindow();
+                               $wrapper = new NoticeWrapper(array_slice($cached, $offset, $limit));
+                               return $wrapper;
+                       } 
+               }
                
                $notice = new Notice();
        

diff --git a/lib/util.php b/lib/util.php
index 48dd1a1b4a075fd106746545d33174854c3eb6d2..edab7aad878b48e0b8cb1950bb51880dac8f7fa0 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -497,7 +497,7 @@ function common_language() {
                     return $language;
                 }
         } else {
-                return $config['site']['language'];
+                return common_config('site', 'language');
         }
 }
 # salted, hashed passwords are stored in the DB