From: Max Shinn <max@zeus.(none)>
Date: Sat, 25 Dec 2010 14:02:17 +0000 (-0600)
Subject: Merge branch 'master' of git://gitorious.org/~trombonechamp/statusnet/trombonechamps... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4af6e0f44c5a016ac29f835a5569ff764e5a1f6c;p=quix0rs-gnu-social.git

Merge branch 'master' of git://gitorious.org/~trombonechamp/statusnet/trombonechamps-gnu-social
---

4af6e0f44c5a016ac29f835a5569ff764e5a1f6c
diff --cc plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
index 4843119557,71bf33a220..5b77475c83
--- a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
+++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
@@@ -67,12 -63,10 +67,12 @@@ class GNUsocialPhotosPlugin extends Plu
      {
          $schema = Schema::get();
          $schema->ensureTable('GNUsocialPhoto',
-                                 array(new ColumnDef('notice_id', 'int(11)', null, false),
+                                 array(new ColumnDef('notice_id', 'int(11)', null, false, 'PRI'),
                                        new ColumnDef('album_id', 'int(11)', null, false),
                                        new ColumnDef('uri', 'varchar(512)', null, false),
 -                                      new ColumnDef('thumb_uri', 'varchar(512)', null, false)));
 +                                      new ColumnDef('thumb_uri', 'varchar(512)', null, false),
 +									  new ColumnDef('title', 'varchar(512)', null, false),
 +									  new ColumnDef('photo_description', 'text', null, false)));
          $schema->ensureTable('GNUsocialPhotoAlbum',
                                  array(new ColumnDef('album_id', 'int(11)', null, false, 'PRI', null, null, true),
                                        new ColumnDef('profile_id', 'int(11)', null, false),