Merge branch 'dev' into 'dev'
PgSQL compatibility on conversion See merge request hubzilla/core!1665
This commit is contained in:
commit
e9a17517d3
@ -45,7 +45,7 @@ if($argc == 2) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$x = q("SELECT DISTINCT resource_id, content FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0");
|
$x = q("SELECT resource_id, content FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0");
|
||||||
|
|
||||||
if($x) {
|
if($x) {
|
||||||
foreach($x as $xx) {
|
foreach($x as $xx) {
|
||||||
@ -85,7 +85,7 @@ if($argc == 2) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$x = q("SELECT DISTINCT resource_id FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0");
|
$x = q("SELECT resource_id FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0");
|
||||||
|
|
||||||
if($x) {
|
if($x) {
|
||||||
foreach($x as $xx) {
|
foreach($x as $xx) {
|
||||||
|
Reference in New Issue
Block a user