diff options
| -rw-r--r-- | Zotlabs/Module/Network.php | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 6e961dc36..5d4239896 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -213,7 +213,7 @@ class Network extends \Zotlabs\Web\Controller { $distinct = ''; $item_thread_top = ' AND item_thread_top = 1 '; - $sql_extra = $sql_options; + $sql_extra = ''; if($group) { $contact_str = ''; @@ -464,7 +464,7 @@ class Network extends \Zotlabs\Web\Controller { WHERE true $uids $item_normal and (abook.abook_blocked = 0 or abook.abook_flags is null) $simple_update - $sql_extra $sql_nets + $sql_extra $sql_options $sql_nets $net_query2 ORDER BY item.received DESC $pager_sql " ); @@ -493,7 +493,7 @@ class Network extends \Zotlabs\Web\Controller { WHERE true $uids $item_thread_top $item_normal AND item.mid = item.parent_mid and (abook.abook_blocked = 0 or abook.abook_flags is null) - $sql_extra3 $sql_extra $sql_nets + $sql_extra3 $sql_extra $sql_options $sql_nets $net_query2 ORDER BY $ordering DESC $pager_sql " ); @@ -506,7 +506,7 @@ class Network extends \Zotlabs\Web\Controller { $net_query WHERE true $uids $item_normal_update $simple_update and (abook.abook_blocked = 0 or abook.abook_flags is null) - $sql_extra3 $sql_extra $sql_nets $net_query2" + $sql_extra3 $sql_extra $sql_options $sql_nets $net_query2" ); $_SESSION['loadtime'] = datetime_convert(); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b7b739969..a9dcc292a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -120,6 +120,9 @@ a:focus, input, optgroup, select, textarea { font-size: 0.9rem !important; +} + +input[type=text], textarea { resize: vertical; background-color: $comment_item_colour; color: $font_colour; |