diff options
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Sse_bs.php | 10 | ||||
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rw-r--r-- | view/tpl/comment_item.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/jot.tpl | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 4b833f4b4..e0db98eb3 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -799,6 +799,7 @@ class ThreadItem { '$submit' => t('Submit'), '$edbold' => t('Bold'), '$editalic' => t('Italic'), + '$edhighlighter' => t('Highlight selected text'), '$eduline' => t('Underline'), '$edquote' => t('Quote'), '$edcode' => t('Code'), diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index 5292abfaa..d214ba28f 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -207,7 +207,7 @@ class Sse_bs extends Controller { $item_normal $sql_extra $sql_extra2 - ORDER BY created DESC, received DESC LIMIT $limit OFFSET $offset", + ORDER BY created DESC LIMIT $limit OFFSET $offset", intval(self::$uid), dbescdate($_SESSION['sse_loadtime']), dbesc(self::$ob_hash) @@ -290,7 +290,7 @@ class Sse_bs extends Controller { $item_normal $sql_extra $sql_extra2 - ORDER BY created DESC, received DESC LIMIT $limit OFFSET $offset", + ORDER BY created DESC LIMIT $limit OFFSET $offset", intval(self::$uid), dbescdate($_SESSION['sse_loadtime']), dbesc(self::$ob_hash) @@ -373,7 +373,7 @@ class Sse_bs extends Controller { $item_normal $sql_extra $sql_extra2 - ORDER BY created DESC, received DESC LIMIT $limit OFFSET $offset", + ORDER BY created DESC LIMIT $limit OFFSET $offset", intval(self::$uid), dbescdate($_SESSION['sse_loadtime']), dbesc(self::$ob_hash) @@ -481,7 +481,7 @@ class Sse_bs extends Controller { $sql_extra $sql_extra2 $sql_extra3 - ORDER BY created DESC, received DESC LIMIT $limit OFFSET $offset", + ORDER BY created DESC LIMIT $limit OFFSET $offset", dbescdate($_SESSION['sse_loadtime']), dbesc(self::$ob_hash), dbescdate($_SESSION['last_login_date'] ?? $_SESSION['static_loadtime']) @@ -679,7 +679,7 @@ class Sse_bs extends Controller { AND author_xchan != '%s' AND item_unseen = 1 $item_normal - ORDER BY created DESC, received DESC", + ORDER BY created DESC", dbesc(ACTIVITY_POST), intval(self::$uid), dbesc(self::$ob_hash) diff --git a/include/conversation.php b/include/conversation.php index ee599c28d..a9dd8373a 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1255,6 +1255,7 @@ function hz_status_editor($x, $popup = false) { '$writefiles' => $writefiles, '$bold' => t('Bold'), '$italic' => t('Italic'), + '$highlighter' => t('Highlight selected text'), '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 059e2793a..1dc7ad88b 100644 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -37,7 +37,7 @@ <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> <i class="bi bi-code comment-icon"></i> </button> - <button class="btn btn-outline-secondary btn-sm border-0" title="highlight" onclick="insertbbcomment('{{$comment}}','mark', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edhighlighter}}" onclick="insertbbcomment('{{$comment}}','mark', {{$id}}); return false;"> <i class="bi bi-highlighter comment-icon"></i> </button> </div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index a6ec453e7..9c9d649aa 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -116,7 +116,7 @@ <button type="button" id="main-editor-code" class="btn btn-outline-secondary btn-sm border-0" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;"> <i class="bi bi-code jot-icons"></i> </button> - <button type="button" id="main-editor-bold" class="btn btn-outline-secondary btn-sm border-0" title="highlight" onclick="inserteditortag('mark', 'profile-jot-text'); return false;"> + <button type="button" id="main-editor-bold" class="btn btn-outline-secondary btn-sm border-0" title="{{$highlighter}}" onclick="inserteditortag('mark', 'profile-jot-text'); return false;"> <i class="bi bi-highlighter jot-icons"></i> </button> </div> |