Remove fulltext indexes from notice and profile tables. The default

[quix0rs-gnu-social.git] / classes / Profile.php

diff --git a/classes/Profile.php b/classes/Profile.php
index 228a0ae2028fc0a61b1d0a55f98420a496ad1b20..8cea91ece6e28ef88b82aa529d2ad01e7c19bf69 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -55,12 +55,12 @@ class Profile extends Managed_DataObject
             'description' => 'local and remote users have profiles',
             'fields' => array(
                 'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-                'nickname' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'nickname or username'),
-                'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name'),
+                'nickname' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'nickname or username', 'collate' => 'utf8_general_ci'),
+                'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name', 'collate' => 'utf8_general_ci'),
                 'profileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL, cached so we dont regenerate'),
-                'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'identifying URL'),
-                'bio' => array('type' => 'text', 'description' => 'descriptive biography'),
-                'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'physical location'),
+                'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'identifying URL', 'collate' => 'utf8_general_ci'),
+                'bio' => array('type' => 'text', 'description' => 'descriptive biography', 'collate' => 'utf8_general_ci'),
+                'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'physical location', 'collate' => 'utf8_general_ci'),
                 'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'),
                 'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
                 'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
@@ -72,10 +72,7 @@ class Profile extends Managed_DataObject
             'primary key' => array('id'),
             'indexes' => array(
                 'profile_nickname_idx' => array('nickname'),
-            ),
-            'fulltext indexes' => array(
-                'nickname' => array('nickname', 'fullname', 'location', 'bio', 'homepage')
-            ),
+            )
         );
     }
 
@@ -98,7 +95,7 @@ class Profile extends Managed_DataObject
         return $this->_user;
     }
 
-       protected $_avatars = array();
+       protected $_avatars;
        
     function getAvatar($width, $height=null)
     {
@@ -106,6 +103,10 @@ class Profile extends Managed_DataObject
             $height = $width;
         }
 
+        if (!isset($this->_avatars)) {
+            $this->_avatars = array();
+        }
+
                if (array_key_exists($width, $this->_avatars)) {
                        return $this->_avatars[$width];
                }
@@ -774,7 +775,7 @@ class Profile extends Managed_DataObject
 
         $faves = new Fave();
         $faves->user_id = $this->id;
-        $cnt = (int) $faves->count('distinct notice_id');
+        $cnt = (int) $faves->count('notice_id');
 
         if (!empty($c)) {
             $c->set(Cache::key('profile:fave_count:'.$this->id), $cnt);