diff options
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 9 | ||||
| -rw-r--r-- | mod/profile.php | 11 | ||||
| -rw-r--r-- | update.php | 14 | ||||
| -rw-r--r-- | view/de/profile_photo.tpl | 4 | ||||
| -rw-r--r-- | view/de/strings.php | 4 | ||||
| -rw-r--r-- | view/fr/strings.php | 2 |
8 files changed, 33 insertions, 17 deletions
@@ -2,8 +2,8 @@ set_time_limit(0); -define ( 'BUILD_ID', 1034 ); -define ( 'FRIENDIKA_VERSION', '2.10.0904' ); +define ( 'BUILD_ID', 1035 ); +define ( 'FRIENDIKA_VERSION', '2.10.0905' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'EOL', "<br />\r\n" ); diff --git a/include/items.php b/include/items.php index 359378ff7..15fd262f4 100644 --- a/include/items.php +++ b/include/items.php @@ -144,7 +144,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`parent` != 0 AND `item`.`wall` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' ) $sql_extra diff --git a/mod/network.php b/mod/network.php index 2ec06fe61..b0196f92a 100644 --- a/mod/network.php +++ b/mod/network.php @@ -79,8 +79,10 @@ function network_content(&$a, $update = 0) { $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $jotplugins = ""; - call_hooks('jot_tool', $jotplugins); + $jotplugins = ""; + call_hooks('jot_tool', $jotplugins); + + $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $o .= replace_macros($tpl,array( '$return_path' => $a->cmd, @@ -92,8 +94,7 @@ function network_content(&$a, $update = 0) { '$lockstate' => $lockstate, '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb), '$bang' => (($group) ? '!' : ''), - '$profile_uid' => $_SESSION['uid'], - '$jotplugins' => $jotplugins + '$profile_uid' => $_SESSION['uid'] )); diff --git a/mod/profile.php b/mod/profile.php index 91c1ba6d8..3b4616a34 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -135,9 +135,11 @@ function profile_content(&$a, $update = 0) { else $lockstate = 'unlock'; - $jotplugins = ""; - call_hooks('jot_tool', $jotplugins); - + $jotplugins = ""; + call_hooks('jot_tool', $jotplugins); + + $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + $o .= replace_macros($tpl,array( '$baseurl' => $a->get_baseurl(), '$defloc' => (($is_owner) ? $a->user['default-location'] : ''), @@ -148,8 +150,7 @@ function profile_content(&$a, $update = 0) { '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$bang' => '', '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''), - '$profile_uid' => $a->profile['profile_uid'], - '$jotplugins' => $jotplugins + '$profile_uid' => $a->profile['profile_uid'] )); } diff --git a/update.php b/update.php index f7bf9da1e..f90983747 100644 --- a/update.php +++ b/update.php @@ -328,3 +328,17 @@ function update_1033() { `updated` DATETIME NOT NULL ) ENGINE = MYISAM DEFAULT CHARSET=utf8;"); } + + +function update_1034() { + + // If you have any of these parent-less posts they can cause problems, and + // we need to delete them. You can't see them anyway. + // Legitimate items will usually get re-created on the next + // pull from the hub. + // But don't get rid of a post that may have just come in + // and may not yet have the parent id set. + + q("DELETE FROM `item` WHERE `parent` = 0 AND `created` < UTC_TIMESTAMP() - INTERVAL 2 MINUTE"); + +} diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl index fe74b4746..10d7d7b97 100644 --- a/view/de/profile_photo.tpl +++ b/view/de/profile_photo.tpl @@ -14,5 +14,5 @@ </form> <div id="profile-photo-link-select-wrapper"> -or <a href='photos/$user'>select a photo from albums</a> -</div>
\ No newline at end of file +oder <a href='photos/$user'>wähle ein Bild aus einem Album</a> +</div> diff --git a/view/de/strings.php b/view/de/strings.php index f59dcf63b..bc31fab78 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -227,8 +227,8 @@ $a->strings['Please contact the sender by replying to this post if you do not wi $a->strings['posted an update.'] = 'posted an update.'; $a->strings['photo'] = 'Foto'; $a->strings['status'] = 'Status'; -$a->strings['likes'] = 'mag es'; -$a->strings['doesn\'t like'] = 'mag es nicht'; +$a->strings['likes'] = 'mag das'; +$a->strings['doesn\'t like'] = 'mag das nicht'; $a->strings['\'s'] = '\'s'; $a->strings['Remote privacy information not available.'] = 'Entfernte Privatsphäreneinstellungen nicht verfügbar.'; $a->strings['Visible to:'] = 'Sichtbar für:'; diff --git a/view/fr/strings.php b/view/fr/strings.php index 39e15eccf..8bac6347f 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -293,7 +293,7 @@ $a->strings['Edit Album'] = 'Éditer l\'album'; $a->strings['View Photo'] = 'Voir la photo'; $a->strings['Photo not available'] = 'Photo indisponible'; $a->strings['Edit photo'] = 'Éditer la photo'; -$a->strings['New album name] = 'Nom du nuovel album'; +$a->strings['New album name'] = 'Nom du nouvel album'; $a->strings['View Full Size'] = 'Voir en taille réelle'; $a->strings['Tags: '] = 'Étiquettes: '; $a->strings['[Remove any tag]'] = '[Retirer toutes les étiquettes]'; |