s4
changeset 392:be955399aec9
Owner should be taken via getvalbyid
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Mon, 05 Dec 2016 10:19:54 +0859 |
| parents | 554dc6669027 |
| children | cee8ffb43ae2 |
| files | s4-funcs.sh |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Tue Nov 29 13:18:47 2016 +0859 1.2 +++ b/s4-funcs.sh Mon Dec 05 10:19:54 2016 +0859 1.3 @@ -1515,7 +1515,7 @@ 1.4 WHERE user='$user' 1.5 AND tblrowid=$blogreadflagrowid), 1.6 "0");"` 1.7 - cat<<EOF # | tee tmp/sql.out 1.8 + cat<<EOF 1.9 `sql4interestblogs` 1.10 WITH article_ctime as ( 1.11 SELECT id,blogid,author,val ctime 1.12 @@ -1649,12 +1649,12 @@ 1.13 ## b is much smaller than a 1.14 cat $tmpf | unhexize \ 1.15 | tee $fifo \ 1.16 - | convert -define ${fmt}:size=${iconxy_M}x${iconxy_M} \ 1.17 - -resize ${iconxy_M}x${iconxy_M}'>' - ${fmt}:- \ 1.18 + | convert -define ${fmt}:size=${iconxy_M} \ 1.19 + -resize ${iconxy_M}'>' - ${fmt}:- \ 1.20 | tee $fifo2 \ 1.21 | convert - "$cacheimg_M" & 1.22 - cat $fifo | convert -define ${fmt}:size=${iconxy_S}x${iconxy_S} \ 1.23 - -resize ${iconxy_S}x${iconxy_S}'>' - ${fmt}:- \ 1.24 + cat $fifo | convert -define ${fmt}:size=${iconxy_S} \ 1.25 + -resize ${iconxy_S}'>' - ${fmt}:- \ 1.26 | convert - "$cacheimg_S" & 1.27 printf '%s' "<img src=\"data:${filetype}," 1.28 hexize "$fifo2" |sed 's/\(..\)/%\1/g' # Use medium as pre-cached image 1.29 @@ -2981,7 +2981,7 @@ 1.30 ##err p2t:grp:q $sql 1.31 isgrpowner $user "`query $sql`" && rowowner=$user 1.32 else 1.33 - rowowner=`query "select owner from $tbl where rowid=$rowid;"` 1.34 + rowowner=`getvalbyid $tbl owner "$rowid"` 1.35 rowowner=${rowowner:-`query "select author from $tbl 1.36 where rowid=$rowid;"`} 1.37 fi