From bc579ff799595d7c4271e3562b554d5cecaf5b5b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 17 Mar 2016 17:41:06 +0100 Subject: [PATCH 1/2] added title element to emoji images in main repository --- include/text.php | 70 ++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/include/text.php b/include/text.php index 07524e851d..c868499cc6 100644 --- a/include/text.php +++ b/include/text.php @@ -1148,41 +1148,41 @@ function smilies($s, $sample = false) { ); $icons = array( - '<3', - '</3', - '<\\3', - ':-)', - ';-)', - ':-(', - ':-P', - ':-p', - ':-\', - ':-\', - ':-x', - ':-X', - ':-D', - '8-|', - '8-O', - ':-O', - '\\o/', - 'o.O', - 'O.o', - 'o_O', - 'O_o', - ':\'(', - ':-!', - ':-/', - ':-[', - '8-)', - ':beer', - ':homebrew', - ':coffee', - ':facepalm', - ':like', - ':dislike', - '~friendica ~friendica', - 'redredmatrix', - 'redredmatrix' + '<3', + '</3', + '<\\3', + ':-)', + ';-)', + ':-(', + ':-P', + ':-p', + ':-\', + ':-\', + ':-x', + ':-X', + ':-D', + '8-|', + '8-O', + ':-O', + '\\o/', + 'o.O', + 'O.o', + 'o_O', + 'O_o', + ':\'(', + ':-!', + ':-/', + ':-[', + '8-)', + ':beer', + ':homebrew', + ':coffee', + ':facepalm', + ':like', + ':dislike', + '~friendica ~friendica', + 'redred#matrix', + 'redred#matrixmatrix' ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s); From a2507804f2eab92df5ff721b3c836da5d1ca7461 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 18 Mar 2016 16:42:10 +0100 Subject: [PATCH 2/2] There is no table "sess_data" - this database call is useless --- include/session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/session.php b/include/session.php index 11641d6cea..12551efc42 100644 --- a/include/session.php +++ b/include/session.php @@ -69,7 +69,7 @@ function ref_session_destroy ($id) { if(! function_exists('ref_session_gc')) { function ref_session_gc($expire) { q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time())); - q("OPTIMIZE TABLE `sess_data`"); + //q("OPTIMIZE TABLE `sess_data`"); return true; }}