diff options
| author | mrjive <mrjive@mrjive.it> | 2018-01-24 18:30:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 18:30:59 +0100 |
| commit | f560a3c98fc7cf4de7d86bd7f074c9995b3d240a (patch) | |
| tree | 7cf16324e513afcf0446e19a0db39ec2ece21672 /include | |
| parent | 131baa9f4584b74ab76328d776c0bb5ce603da7d (diff) | |
| parent | add9890754780c886188504647b3058c4cc146c1 (diff) | |
| download | volse-hubzilla-f560a3c98fc7cf4de7d86bd7f074c9995b3d240a.tar.gz volse-hubzilla-f560a3c98fc7cf4de7d86bd7f074c9995b3d240a.tar.bz2 volse-hubzilla-f560a3c98fc7cf4de7d86bd7f074c9995b3d240a.zip | |
Merge pull request #11 from redmatrix/dev
Dev
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 11 | ||||
| -rw-r--r-- | include/network.php | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index d0b9cffc9..b12ad1d85 100755 --- a/include/items.php +++ b/include/items.php @@ -3009,14 +3009,17 @@ function check_item_source($uid, $item) { $words = explode("\n",$r[0]['src_patt']); if($words) { foreach($words as $word) { - if(substr($word,0,1) === '#' && $tags) { + $w = trim($word); + if(! $w) + continue; + if(substr($w,0,1) === '#' && $tags) { foreach($tags as $t) - if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) + if((($t['ttype'] == TERM_HASHTAG) || ($t['ttype'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($w,1)) || (substr($w,1) === '*'))) return true; } - elseif((strpos($word,'/') === 0) && preg_match($word,$text)) + elseif((strpos($w,'/') === 0) && preg_match($w,$text)) return true; - elseif(stristr($text,$word) !== false) + elseif(stristr($text,$w) !== false) return true; } } diff --git a/include/network.php b/include/network.php index 79a8c6578..2ac430e82 100644 --- a/include/network.php +++ b/include/network.php @@ -1579,6 +1579,7 @@ function get_site_info() { $channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat')); $channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat')); $local_posts_stat = intval(get_config('system','local_posts_stat')); + $local_comments_stat = intval(get_config('system','local_comments_stat')); $hide_in_statistics = intval(get_config('system','hide_in_statistics')); $site_expire = intval(get_config('system', 'default_expire_days')); @@ -1612,13 +1613,14 @@ function get_site_info() { 'default_service_restrictions' => $service_class, 'locked_features' => $locked_features, 'admin' => $admin, - 'dbdriver' => DBA::$dba->getdriver(), + 'dbdriver' => DBA::$dba->getdriver() . ' ' . ((ACTIVE_DBTYPE == DBTYPE_POSTGRES) ? 'postgres' : 'mysql'), 'lastpoll' => get_config('system','lastpoll'), 'info' => (($site_info) ? $site_info : ''), 'channels_total' => $channels_total_stat, 'channels_active_halfyear' => $channels_active_halfyear_stat, 'channels_active_monthly' => $channels_active_monthly_stat, 'local_posts' => $local_posts_stat, + 'local_comments' => $local_comments_stat, 'hide_in_statistics' => $hide_in_statistics ]; |