diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-06-03 11:44:31 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-06-03 11:44:31 +0200 |
| commit | e6da910ee23d7547d51c91098c911870b8e168f9 (patch) | |
| tree | 27b73d3034c7c5ca3485ac1eb9d4012b4b60483c | |
| parent | b6bd2884d56877b9b6c69ac1403e17060341256e (diff) | |
| parent | 2100ac3cfcb023a0c5ac1658fbc6a629909a4682 (diff) | |
| download | volse-hubzilla-e6da910ee23d7547d51c91098c911870b8e168f9.tar.gz volse-hubzilla-e6da910ee23d7547d51c91098c911870b8e168f9.tar.bz2 volse-hubzilla-e6da910ee23d7547d51c91098c911870b8e168f9.zip | |
Merge branch 'dev' into 4.2RC
| -rw-r--r-- | Zotlabs/Module/Search.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Widget/Categories.php | 3 | ||||
| -rw-r--r-- | include/text.php | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 838f9d6b9..214ece9a3 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -38,8 +38,8 @@ class Search extends \Zotlabs\Web\Controller { $observer_hash = (($observer) ? $observer['xchan_hash'] : ''); $o = '<div id="live-search"></div>' . "\r\n"; - - $o = '<div class="generic-content-wrapper-styled">' . "\r\n"; + + $o .= '<div class="generic-content-wrapper-styled">' . "\r\n"; $o .= '<h3>' . t('Search') . '</h3>'; diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index 27d4b5980..82c37cd0c 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -18,10 +18,9 @@ class Categories { $articles = ((array_key_exists('articles',$arr) && $arr['articles']) ? true : false); - if(($articles) && (! feature_enabled(App::$profile['profile_uid'],'articles'))) + if(($articles) && (! Apps::system_app_installed(App::$profile['profile_uid'],'Articles'))) return ''; - if((! App::$profile['profile_uid']) || (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) { return ''; diff --git a/include/text.php b/include/text.php index 6a2a9e427..a2dfda952 100644 --- a/include/text.php +++ b/include/text.php @@ -3091,7 +3091,7 @@ function item_url_replace($channel,&$item,$old,$new,$oldnick = '') { json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['target']); } - $item['body'] = preg_replace("/(\[zrl=".preg_quote($old,'/')."\/(photos|gallery)\/".$channel['channel_address'].".+\]\[zmg=\d+x\d+\])".preg_quote($old,'/')."\/(.+\[\/zmg\])/", '${1}'.$new.'/${3}', $item['body']); + $item['body'] = preg_replace("/(\[zrl=".preg_quote($old,'/')."\/(photo|photos|gallery)\/".$channel['channel_address'].".+\]\[zmg=\d+x\d+\])".preg_quote($old,'/')."\/(.+\[\/zmg\])/", '${1}'.$new.'/${3}', $item['body']); $item['body'] = preg_replace("/".preg_quote($old,'/')."\/(search|\w+\/".$channel['channel_address'].")/", $new.'/${1}', $item['body']); $item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey'])); |