diff options
| author | friendica <info@friendica.com> | 2013-12-19 19:16:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-19 19:16:46 -0800 |
| commit | bccc20f38c3919d453b0dee1ed354aa4eb13b398 (patch) | |
| tree | 0e9fa8e0de4e4e6807223ac176a55ad8e3bce77e | |
| parent | 648a7a5735148479fc8d97bfaa1f3d3cca249276 (diff) | |
| download | volse-hubzilla-bccc20f38c3919d453b0dee1ed354aa4eb13b398.tar.gz volse-hubzilla-bccc20f38c3919d453b0dee1ed354aa4eb13b398.tar.bz2 volse-hubzilla-bccc20f38c3919d453b0dee1ed354aa4eb13b398.zip | |
default photo issue, and connections page showing deleted accounts. Also show last updated on connedit page
| -rw-r--r-- | doc/bbcode.html | 2 | ||||
| -rw-r--r-- | include/identity.php | 2 | ||||
| -rw-r--r-- | mod/connections.php | 8 | ||||
| -rw-r--r-- | mod/connedit.php | 2 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 4 |
5 files changed, 12 insertions, 6 deletions
diff --git a/doc/bbcode.html b/doc/bbcode.html index 6f7e21bcc..7183f50c1 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -6,7 +6,7 @@ <li>[i]italic[/i] - <em>italic</em><br /> <li>[u]underlined[/u] - <u>underlined</u><br /> <li>[s]strike[/s] - <strike>strike</strike><br /> -<li>[color= red]red[/color] - <span style="color: red;">red</span><br /> +<li>[color=red]red[/color] - <span style="color: red;">red</span><br /> <li>[url=https://www.redmatrix.me]Red Matrix[/url] <a href="https://redmatrix.me">Red Matrix</a><br /> <li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br /> <li>[code]code[/code] <code>code</code><br /> diff --git a/include/identity.php b/include/identity.php index 4d38b2828..80f02a9c5 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1124,7 +1124,7 @@ function get_default_profile_photo($size = 175) { $scheme = get_config('system','default_profile_photo'); if(! $scheme) $scheme = 'rainbow_man'; - return 'images/default_profile_photos/' . $scheme . '/' . $size . 'jpg'; + return 'images/default_profile_photos/' . $scheme . '/' . $size . '.jpg'; } diff --git a/mod/connections.php b/mod/connections.php index 0365a0585..2119c69c7 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -300,9 +300,10 @@ function connections_content(&$a) { $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash - where abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ", + where abook_channel = %d and not (abook_flags & %d) and not (xchan_flags & %d ) $sql_extra $sql_extra2 ", intval(local_user()), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED) ); if(count($r)) { $a->set_pager_total($r[0]['total']); @@ -310,9 +311,10 @@ function connections_content(&$a) { } $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash - WHERE abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", + WHERE abook_channel = %d and not (abook_flags & %d) and not ( xchan_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", intval(local_user()), intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED), intval($a->pager['start']), intval($a->pager['itemspage']) ); diff --git a/mod/connedit.php b/mod/connedit.php index 6d34ad997..c6c8845c8 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -482,7 +482,7 @@ function connedit_content(&$a) { '$lastupdtext' => t('Last update:'), '$lost_contact' => $lost_contact, '$updpub' => t('Update public posts'), - '$last_update' => $last_update, + '$last_update' => relative_date($contact['abook_connected']), '$udnow' => t('Update now'), '$profile_select' => contact_profile_assign($contact['abook_profile']), '$multiprofs' => feature_enabled(local_user(),'multi_profiles'), diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 23368f2f7..590213fd3 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -16,6 +16,10 @@ <div id="contact-edit-wrapper"> +{{if $last_update}} +{{$lastupdtext}} {{$last_update}} +{{/if}} + {{if $notself}} {{if $slide}} <h3>{{$lbl_slider}}</h3> |