diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:16:33 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:16:33 +0200 |
| commit | 1c5629263bcb4d6b3ffad23fc4571de20eeab029 (patch) | |
| tree | 4eb3276fe828ce7c424227e2165be2ce6e4347cb /include | |
| parent | 2a482223935ed02e275214093ab25b6ef1261381 (diff) | |
| parent | 4addde782e8d79e6ac1a964af4fb9197f74d3dfb (diff) | |
| download | volse-hubzilla-1c5629263bcb4d6b3ffad23fc4571de20eeab029.tar.gz volse-hubzilla-1c5629263bcb4d6b3ffad23fc4571de20eeab029.tar.bz2 volse-hubzilla-1c5629263bcb4d6b3ffad23fc4571de20eeab029.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 1 | ||||
| -rw-r--r-- | include/text.php | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/items.php b/include/items.php index 5a0ca01c6..e7bec7f20 100755 --- a/include/items.php +++ b/include/items.php @@ -1600,7 +1600,6 @@ function item_store($arr, $allow_exec = false, $deliver = true) { $arr['aid'] = ((x($arr,'aid')) ? intval($arr['aid']) : 0); $arr['mid'] = ((x($arr,'mid')) ? notags(trim($arr['mid'])) : random_string()); $arr['revision'] = ((x($arr,'revision') && intval($arr['revision']) > 0) ? intval($arr['revision']) : 0); -logger('revision: ' . $arr['revision']); $arr['author_xchan'] = ((x($arr,'author_xchan')) ? notags(trim($arr['author_xchan'])) : ''); $arr['owner_xchan'] = ((x($arr,'owner_xchan')) ? notags(trim($arr['owner_xchan'])) : ''); diff --git a/include/text.php b/include/text.php index 5af4f1b67..dd2dc7620 100644 --- a/include/text.php +++ b/include/text.php @@ -2401,13 +2401,6 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d //...do nothing return $replaced; } - if($tag == '#getzot') { - $basetag = 'getzot'; - $url = 'http://hubzilla.org'; - $newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]'; - $body = str_replace($tag,$newtag,$body); - $replaced = true; - } if(! $replaced) { //base tag has the tags name only |