diff options
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | mod/search.php | 2 | ||||
| -rwxr-xr-x | util/shredder/shredder | 17 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 4 insertions, 19 deletions
diff --git a/mod/display.php b/mod/display.php index 15b76e63d..31cce95d3 100644 --- a/mod/display.php +++ b/mod/display.php @@ -175,7 +175,7 @@ function display_content(&$a, $update = 0, $load = false) { and mid = '%s' AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' 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') $sql_extra ) group by mid limit 1", diff --git a/mod/search.php b/mod/search.php index 2c2e8c86a..663d355e2 100644 --- a/mod/search.php +++ b/mod/search.php @@ -143,7 +143,7 @@ function search_content(&$a,$update = 0, $load = false) { WHERE item_restrict = 0 AND (((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' 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') $sql_extra group by mid ORDER BY created DESC $pager_sql", diff --git a/util/shredder/shredder b/util/shredder/shredder index c46dfe0ec..5073d5b2f 100755 --- a/util/shredder/shredder +++ b/util/shredder/shredder @@ -116,8 +116,6 @@ load_config () { if [ $THISDIR == '' ]; then THISDIR=. ; fi PATH=$THISDIR:$PATH - - # Source ShredOAuth.sh OAuth_sh=$(which ShredOAuth.sh) (( $? != 0 )) && echo 'Unable to locate ShredOAuth.sh! Make sure it is in searching PATH.' && exit 1 @@ -160,7 +158,7 @@ main () { JS_Fields=() fcli_opts= - while getopts "C:c:s:r:f:i:q:h" name + while getopts "C:c:s:r:f:q:h" name do case $name in c) fcli_command="$OPTARG";; @@ -170,7 +168,6 @@ main () { f) fcli_file="$OPTARG";; h) fcli_help_flag="1";; q) fcli_opts=("${fcli_opts[@]}" "$OPTARG");; - i) JS_Fields=("${JS_Fields[@]}" "$OPTARG");; ?) usage exit 2;; esac @@ -222,18 +219,6 @@ main () { 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 ;; diff --git a/version.inc b/version.inc index a50c5902c..acddaabc4 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-06-18.710 +2014-06-19.711 |