harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-05-22 03:51:58 -07:00
parent 36a960adec 50e9d02458
commit 1c8c7479b8
11 changed files with 276 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dba/dba_driver.php
+1 -1
View File
@@ -452,7 +452,7 @@ function db_getfunc($f) {
function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) {
if(\DBA::$logging)
if(\DBA::$logging || ! \DBA::$dba)
return;
$saved = \DBA::$dba->debug;
include/text.php
-2
View File
@@ -1158,7 +1158,6 @@ function list_smilies($default_only = false) {
$texts = array(
'<3',
'</3',
'<\\3',
':-)',
';-)',
':-(',
@@ -1193,7 +1192,6 @@ function list_smilies($default_only = false) {
$icons = array(
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-heart.gif" alt="&lt;3" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-brokenheart.gif" alt="&lt;/3" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-brokenheart.gif" alt="&lt;\\3" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-smile.gif" alt=":-)" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-wink.gif" alt=";-)" />',
'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-frown.gif" alt=":-(" />',