aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/Photo.php2
-rw-r--r--include/zot.php4
-rw-r--r--version.inc2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/Photo.php b/include/Photo.php
index f77605b98..c3165cc9f 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -528,7 +528,7 @@ class Photo {
$x = q("select id from photo where `resource_id` = '%s' and uid = %d and `xchan` = '%s' and `scale` = %d limit 1",
dbesc($rid),
intval($uid),
- intval($xchan),
+ dbesc($xchan),
intval($scale)
);
if(count($x)) {
diff --git a/include/zot.php b/include/zot.php
index 2d2bc92c6..7e1f781a4 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -406,7 +406,7 @@ function import_xchan_from_json($j) {
require_once("Photo.php");
- $photos = import_profile_photo($j->photo,0,$xchan_hash);
+ $photos = import_profile_photo($j->photo,$xchan_hash);
$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
where xchan_hash = '%s' limit 1",
dbesc($j->photo_updated),
@@ -524,7 +524,7 @@ function import_xchan($arr) {
require_once("Photo.php");
- $photos = import_profile_photo($arr['photo'],0,$xchan_hash);
+ $photos = import_profile_photo($arr['photo'],$xchan_hash);
$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
where xchan_hash = '%s' limit 1",
dbesc($arr['photo_updated']),
diff --git a/version.inc b/version.inc
index eeab63b3f..a69a6ee09 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-12-05.160
+2012-12-06.161