diff options
| author | friendica <info@friendica.com> | 2013-12-22 18:37:39 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-22 18:37:39 -0800 |
| commit | 1a42580ad44f768ba8d4eb0669f3b8be03670e04 (patch) | |
| tree | e40948063cea08c8c0ea4ece8efbcc6bef6464d8 /mod/fbrowser.php | |
| parent | eff38538eeaa3af0774c77d26c5b00dd79cb9e8c (diff) | |
| download | volse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.tar.gz volse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.tar.bz2 volse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.zip | |
remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code.
Diffstat (limited to 'mod/fbrowser.php')
| -rw-r--r-- | mod/fbrowser.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/fbrowser.php b/mod/fbrowser.php index baacfe56b..19bd77914 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -45,7 +45,7 @@ function fbrowser_content($a){ $path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album); } - $r = q("SELECT `resource_id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` + $r = q("SELECT `resource_id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `description` FROM `photo` WHERE `uid` = %d $sql_extra GROUP BY `resource_id` $sql_extra2", intval(local_user()) |