https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1a61cee
)
more spaces + some curly spaces added
author
Roland Häder
<roland@mxchange.org>
Thu, 26 Jan 2017 15:07:30 +0000
(16:07 +0100)
committer
Roland Häder
<roland@mxchange.org>
Mon, 14 May 2018 20:49:55 +0000
(22:49 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
include/text.php
patch
|
blob
|
history
diff --git
a/include/text.php
b/include/text.php
index
b7f7b5a
..
6a11a8b
100644
(file)
--- a/
include/text.php
+++ b/
include/text.php
@@
-1918,8
+1918,15
@@
function file_tag_save_file($uid, $item, $file)
return true;
}
+<<<<<<< HEAD
function file_tag_unsave_file($uid, $item, $file, $cat = false)
{
+=======
+function file_tag_unsave_file($uid, $item, $file, $cat = false) {
+ require_once "include/files.php";
+
+ $result = false;
+>>>>>>> more spaces + some curly spaces added
if (! intval($uid)) {
return false;
}