diff options
| -rw-r--r-- | Zotlabs/Daemon/Master.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Display.php | 5 | ||||
| -rw-r--r-- | include/text.php | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index 6fb674d60..ed1adf8fb 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -126,7 +126,6 @@ class Master { static public function ClearQueue() { $work = q("select * from config where cat='queuework' and k like '%s'", - 'workitem_%', dbesc('workitem%')); foreach ($work as $workitem) { $workinfo = unserialize($workitem['v']); @@ -137,7 +136,6 @@ class Master { $cls::run($argc,$argv); } $work = q("delete from config where cat='queuework' and k like '%s'", - 'workitem_%', dbesc('workitem%')); } diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 8b46ebb79..d1755c183 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -12,7 +12,7 @@ class Display extends \Zotlabs\Web\Controller { function get($update = 0, $load = false) { - $noscript_content = get_config('system', 'noscript_content', '1'); + $noscript_content = (get_config('system', 'noscript_content', '1') && (! $update)); $module_format = 'html'; @@ -299,7 +299,6 @@ class Display extends \Zotlabs\Web\Controller { require_once('include/channel.php'); $sys = get_sys_channel(); $sysid = $sys['channel_id']; - if(local_channel()) { $r = q("SELECT item.parent AS item_id from item WHERE uid = %d @@ -340,7 +339,7 @@ class Display extends \Zotlabs\Web\Controller { else { $r = array(); } - + if($r) { $parents_str = ids_to_querystr($r,'item_id'); if($parents_str) { diff --git a/include/text.php b/include/text.php index f03d0b860..1d884593f 100644 --- a/include/text.php +++ b/include/text.php @@ -2965,7 +2965,9 @@ function item_url_replace($channel,&$item,$old,$new,$oldnick = '') { json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['target']); } - if(string_replace($old,$new,$item['body'])) { + $x = preg_replace("/".preg_quote($old,'/')."\/(search|\w+\/".$channel['channel_address'].")/", $new.'/${1}', $item['body']); + if($x) { + $item['body'] = $x; $item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey'])); $item['item_verified'] = 1; } |