Changeset 21 for trunk/includes

Timestamp:

08/12/05 20:59:53 (7 years ago)

Author:

alexx

Message:

Add pagination to friends list

Location:

trunk/includes

Files:

• functions.inc.php (modified) (2 diffs)
• pager.inc.php (modified) (1 diff)

trunk/includes/functions.inc.php

@@ -267 +267 @@
 }
 
-function get_cache_user_info($id, $fields="", $update_friends_order=false)
+function get_cache_user_info($id, $fields=null, $update_friends_order=false)
 {
         global $db;
@@ -274 +274 @@
         global $url_id;
 
-        if(!$fields)
+        if(is_null($fields))
                 $fields = 'id, login, fname, lname, nick, country, gender, relationship_status, here_for, nb_friends, friends_id, nb_communities, communities_id, nb_fans, nb_bookmarks, nb_blogs, nb_photos, fun, cool, sexy, photo, join_date';
 

trunk/includes/pager.inc.php

@@ -47 +47 @@
                 if(!is_null($data))
                         $params['itemData'] = $data;
-                return parent::factory($default_params + $params);
+                return parent::factory(array_merge($default_params, $params));
         }
 }