harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
friendica 2014-06-19 16:09:02 -07:00
parent 4c0b8bc637
commit 00904d4994
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/display.php
View File

@ -175,7 +175,7 @@ function display_content(&$a, $update = 0, $load = false) {
and mid = '%s' and mid = '%s'
AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
AND `item`.`deny_gid` = '' AND item_private = 0 ) AND `item`.`deny_gid` = '' AND item_private = 0 )
and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " )) and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
OR owner_xchan = '%s') OR owner_xchan = '%s')
$sql_extra ) $sql_extra )
group by mid limit 1", group by mid limit 1",

2
mod/search.php
View File

@ -143,7 +143,7 @@ function search_content(&$a,$update = 0, $load = false) {
WHERE item_restrict = 0 WHERE item_restrict = 0
AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
AND `item`.`deny_gid` = '' AND item_private = 0 ) AND `item`.`deny_gid` = '' AND item_private = 0 )
and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " )) and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
$pub_sql ) OR owner_xchan = '%s') $pub_sql ) OR owner_xchan = '%s')
$sql_extra $sql_extra
group by mid ORDER BY created DESC $pager_sql", group by mid ORDER BY created DESC $pager_sql",

17
util/shredder/shredder
View File

@ -116,8 +116,6 @@ load_config () {
if [ $THISDIR == '' ]; then THISDIR=. ; fi if [ $THISDIR == '' ]; then THISDIR=. ; fi
PATH=$THISDIR:$PATH PATH=$THISDIR:$PATH
# Source ShredOAuth.sh # Source ShredOAuth.sh
OAuth_sh=$(which ShredOAuth.sh) OAuth_sh=$(which ShredOAuth.sh)
(( $? != 0 )) && echo 'Unable to locate ShredOAuth.sh! Make sure it is in searching PATH.' && exit 1 (( $? != 0 )) && echo 'Unable to locate ShredOAuth.sh! Make sure it is in searching PATH.' && exit 1
@ -160,7 +158,7 @@ main () {
JS_Fields=() JS_Fields=()
fcli_opts= fcli_opts=
while getopts "C:c:s:r:f:i:q:h" name while getopts "C:c:s:r:f:q:h" name
do do
case $name in case $name in
c) fcli_command="$OPTARG";; c) fcli_command="$OPTARG";;
@ -170,7 +168,6 @@ main () {
f) fcli_file="$OPTARG";; f) fcli_file="$OPTARG";;
h) fcli_help_flag="1";; h) fcli_help_flag="1";;
q) fcli_opts=("${fcli_opts[@]}" "$OPTARG");; q) fcli_opts=("${fcli_opts[@]}" "$OPTARG");;
i) JS_Fields=("${JS_Fields[@]}" "$OPTARG");;
?) usage ?) usage
exit 2;; exit 2;;
esac esac
@ -222,18 +219,6 @@ main () {
echo $FO_ret echo $FO_ret
# JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
# for a in ${JS_Parsed[@]}; do
# if [ ${#JS_Fields[@]} != 0 ]; then
# for b in ${JS_Fields[@]}; do
# echo "$JS_Parsed" | js ${a} ${b}
# done
# else
# echo "$JS_Parsed"
# fi
# done
return $FO_rval return $FO_rval
;; ;;

2
version.inc
View File

@ -1 +1 @@
2014-06-18.710 2014-06-19.711