aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-03-21 18:29:08 -0700
committerfriendica <info@friendica.com>2013-03-21 18:29:08 -0700
commit0999b88a486b2b392bf3b785d3da7ea1652ab1c2 (patch)
treeeb70621f682c6ec71cc4f10b774b4fb8c703c3db
parentddf5bf8968a12501939cd37898d303967b748600 (diff)
parentfe87e7f972ecdc09296cf0a064f978e1bb57a8b8 (diff)
downloadvolse-hubzilla-0999b88a486b2b392bf3b785d3da7ea1652ab1c2.tar.gz
volse-hubzilla-0999b88a486b2b392bf3b785d3da7ea1652ab1c2.tar.bz2
volse-hubzilla-0999b88a486b2b392bf3b785d3da7ea1652ab1c2.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--include/event.php4
-rw-r--r--view/tpl/event_head.tpl14
-rw-r--r--view/tpl/smarty3/event_head.tpl14
3 files changed, 17 insertions, 15 deletions
diff --git a/include/event.php b/include/event.php
index 70257968f..29ada2e96 100644
--- a/include/event.php
+++ b/include/event.php
@@ -169,6 +169,8 @@ function event_store($arr) {
return $r[0]['id'];
}
+ $event_hash = $r[0]['event_hash'];
+
// The event changed. Update it.
$r = q("UPDATE `event` SET
@@ -205,7 +207,7 @@ function event_store($arr) {
);
$r = q("SELECT * FROM item left join xchan on author_xchan = xchan_hash WHERE resource_id = '%s' AND resource_type = 'event' and uid = %d LIMIT 1",
- intval($r[0]['event_hash']),
+ dbesc($event_hash),
intval($arr['uid'])
);
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 471748b97..45f07cf5d 100644
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -27,21 +27,21 @@
eventRender: function(event, element, view) {
//console.log(view.name);
- if (event.item['author-name']==null) return;
+ if (event.item['author']['xchan_name']==null) return;
switch(view.name){
case "month":
element.find(".fc-event-title").html(
"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
- event.item['author-avatar'],
- event.item['author-name'],
+ event.item['author']['xchan_photo_s'],
+ event.item['author']['xchan_name'],
event.title
));
break;
case "agendaWeek":
element.find(".fc-event-title").html(
"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
- event.item['author-avatar'],
- event.item['author-name'],
+ event.item['author']['xchan_photo_s'],
+ event.item['author']['xchan_name'],
event.item.desc,
event.item.location
));
@@ -49,8 +49,8 @@
case "agendaDay":
element.find(".fc-event-title").html(
"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
- event.item['author-avatar'],
- event.item['author-name'],
+ event.item['author']['xchan_photo_s'],
+ event.item['author']['xchan_name'],
event.item.desc,
event.item.location
));
diff --git a/view/tpl/smarty3/event_head.tpl b/view/tpl/smarty3/event_head.tpl
index 32288b7ad..6cbb98ae7 100644
--- a/view/tpl/smarty3/event_head.tpl
+++ b/view/tpl/smarty3/event_head.tpl
@@ -32,21 +32,21 @@
eventRender: function(event, element, view) {
//console.log(view.name);
- if (event.item['author-name']==null) return;
+ if (event.item['author']['xchan_name']==null) return;
switch(view.name){
case "month":
element.find(".fc-event-title").html(
"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
- event.item['author-avatar'],
- event.item['author-name'],
+ event.item['author']['xchan_photo_s'],
+ event.item['author']['xchan_name'],
event.title
));
break;
case "agendaWeek":
element.find(".fc-event-title").html(
"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
- event.item['author-avatar'],
- event.item['author-name'],
+ event.item['author']['xchan_photo_s'],
+ event.item['author']['xchan_name'],
event.item.desc,
event.item.location
));
@@ -54,8 +54,8 @@
case "agendaDay":
element.find(".fc-event-title").html(
"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
- event.item['author-avatar'],
- event.item['author-name'],
+ event.item['author']['xchan_photo_s'],
+ event.item['author']['xchan_name'],
event.item.desc,
event.item.location
));