diff options
| author | friendica <info@friendica.com> | 2012-09-03 22:32:35 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-09-03 22:32:35 -0700 |
| commit | 2df083efb10c1282b33900b588c0d39987f3c9b2 (patch) | |
| tree | 56c980148e54a0ea3244a62fc0cf4111b3f11613 | |
| parent | fb35742aab9b08ddee06fb576231a3248e77e185 (diff) | |
| download | volse-hubzilla-2df083efb10c1282b33900b588c0d39987f3c9b2.tar.gz volse-hubzilla-2df083efb10c1282b33900b588c0d39987f3c9b2.tar.bz2 volse-hubzilla-2df083efb10c1282b33900b588c0d39987f3c9b2.zip | |
rev update
| -rw-r--r-- | database.sql | 5 | ||||
| -rw-r--r-- | include/text.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/database.sql b/database.sql index cbd2c235e..299569310 100644 --- a/database.sql +++ b/database.sql @@ -226,9 +226,11 @@ CREATE TABLE IF NOT EXISTS `entity` ( `entity_timezone` char(128) NOT NULL DEFAULT 'UTC', `entity_location` char(255) NOT NULL DEFAULT '', `entity_theme` char(255) NOT NULL DEFAULT '', + `entity_startpage` char(255) NOT NULL DEFAULT '', `entity_pubkey` text NOT NULL, `entity_prvkey` text NOT NULL, `entity_privacyflags` int(10) unsigned NOT NULL DEFAULT '0', + `entity_postflags` int(10) unsigned NOT NULL DEFAULT '0', `entity_notifyflags` int(10) unsigned NOT NULL DEFAULT '65535', `entity_pageflags` int(10) unsigned NOT NULL DEFAULT '0', `entity_max_anon_mail` int(10) unsigned NOT NULL DEFAULT '10', @@ -253,7 +255,8 @@ CREATE TABLE IF NOT EXISTS `entity` ( KEY `entity_max_anon_mail` (`entity_max_anon_mail`), KEY `entity_max_friend_req` (`entity_max_friend_req`), KEY `entity_default_gid` (`entity_default_gid`), - KEY `entity_primary` (`entity_primary`) + KEY `entity_primary` (`entity_primary`), + KEY `entity_postflags` (`entity_postflags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `event` ( diff --git a/include/text.php b/include/text.php index 0b4ed6ee6..c57d8a50a 100644 --- a/include/text.php +++ b/include/text.php @@ -935,7 +935,7 @@ function prepare_body($item,$attach = false) { } $title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1])); $title .= ' ' . $mtch[2] . ' ' . t('bytes'); - if((local_user() == $item['uid']) && $item['contact-id'] != $a->contact['id']) + if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) $the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1]; else $the_url = $mtch[1]; diff --git a/version.inc b/version.inc index 2a8741dac..ac7d596c4 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-09-02.65 +2012-09-03.66 |