From 51c3606715573d8cea3c79ff7bc989a4ba86acc5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 2 Feb 2010 09:30:15 -0800
Subject: Fix regression breaking file attachments. This is what I get for
 rushing fixes and not properly testing them. :P

---
 classes/File.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/File.php b/classes/File.php
index 6dd9e0c06..ee418a802 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -181,7 +181,7 @@ class File extends Memcached_DataObject
      */
     static function validFilename($filename)
     {
-        return preg_match('^/[A-Za-z0-9._-]+$/', $filename);
+        return preg_match('/^[A-Za-z0-9._-]+$/', $filename);
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf


From 6215b9788c8d1f523d4d173ecf40f185bd024bca Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 3 Feb 2010 11:53:31 -0500
Subject: add nickname as unique key for user_group table

---
 classes/statusnet.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'classes')

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 6203650a6..e28424ce2 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -585,6 +585,7 @@ modified = 384
 
 [user_group__keys]
 id = N
+nickname = U
 
 [user_openid]
 canonical = 130
-- 
cgit v1.2.3-54-g00ecf


From dbeb388adefec94c3bb34e99305a004d845b719c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 3 Feb 2010 12:31:25 -0500
Subject: clear cache for Profile::hasRepeated() at Notice::insert() time

---
 classes/Notice.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'classes')

diff --git a/classes/Notice.php b/classes/Notice.php
index 42878d94f..f9f386357 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1468,4 +1468,25 @@ class Notice extends Memcached_DataObject
             $handler->handle($this);
         }
     }
+
+    function insert()
+    {
+        $result = parent::insert();
+
+        if ($result) {
+            // Profile::hasRepeated() abuses pkeyGet(), so we
+            // have to clear manually
+            if (!empty($this->repeat_of)) {
+                $c = self::memcache();
+                if (!empty($c)) {
+                    $ck = self::multicacheKey('Notice',
+                                              array('profile_id' => $this->profile_id,
+                                                    'repeat_of' => $this->repeat_of));
+                    $c->delete($ck);
+                }
+            }
+        }
+
+        return $result;
+    }
 }
-- 
cgit v1.2.3-54-g00ecf