aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-22 03:51:58 -0700
committerzotlabs <mike@macgirvin.com>2017-05-22 03:51:58 -0700
commit1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d (patch)
tree30f9100f61e54bd800d859af3dc45dcab56e5cee /include
parent36a960adec9f216463890640340324d6d37a65d0 (diff)
parent50e9d024581ddf57f37a6302bc089a88237657bb (diff)
downloadvolse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.tar.gz
volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.tar.bz2
volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
-rwxr-xr-xinclude/dba/dba_driver.php2
-rw-r--r--include/text.php2
2 files changed, 1 insertions, 3 deletions
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index ad1d9d194..d362f58b2 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -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;
diff --git a/include/text.php b/include/text.php
index fb39313a2..b17564b9f 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1158,7 +1158,6 @@ function list_smilies($default_only = false) {
$texts = array(
'&lt;3',
'&lt;/3',
- '&lt;\\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=":-(" />',