aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-06 02:57:33 -0700
committerfriendica <info@friendica.com>2014-04-06 02:57:33 -0700
commitad60e2c566930409d853517ca9392f169fc8e747 (patch)
tree120630a3c0dbf43de66ab5f46714a7f75072e2c5 /install
parenta2b949f3393206ffe2e1195d6abaa883f299b471 (diff)
downloadvolse-hubzilla-ad60e2c566930409d853517ca9392f169fc8e747.tar.gz
volse-hubzilla-ad60e2c566930409d853517ca9392f169fc8e747.tar.bz2
volse-hubzilla-ad60e2c566930409d853517ca9392f169fc8e747.zip
use parent_mid in the parent query for enotify instead of of the parent id. This should fix the issue with encrypted content in the notification messages (for locally posted replies). The fix was a bit harder than anticipated because we store the parent id as an int in the notify table so this had to be modified to char storage as well.
Diffstat (limited to 'install')
-rw-r--r--install/database.sql2
-rw-r--r--install/update.php9
2 files changed, 9 insertions, 2 deletions
diff --git a/install/database.sql b/install/database.sql
index f9562ae09..a5094b8e1 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -622,7 +622,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
`aid` int(11) NOT NULL,
`uid` int(11) NOT NULL,
`link` char(255) NOT NULL,
- `parent` int(11) NOT NULL,
+ `parent` char(255) NOT NULL DEFAULT '',
`seen` tinyint(1) NOT NULL DEFAULT '0',
`type` int(11) NOT NULL,
`verb` char(255) NOT NULL,
diff --git a/install/update.php b/install/update.php
index d7a87fad4..d497cda70 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1106 );
+define( 'UPDATE_VERSION' , 1107 );
/**
*
@@ -1182,3 +1182,10 @@ CHANGE `site_sync` `site_sync` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
return UPDATE_FAILED;
}
+function update_r1106() {
+ $r = q("ALTER TABLE `notify` CHANGE `parent` `parent` CHAR( 255 ) NOT NULL DEFAULT ''");
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}
+