diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2012-06-07 08:43:55 -0700 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2012-06-07 08:43:55 -0700 |
| commit | fcf8f301e595444620f07ea0e01994ea99ee961b (patch) | |
| tree | f0d16d5bfe8e12a74afe2071970c83bdc10cbf35 | |
| parent | 6477c24919eb969d80324cf29129213f2fb8a0ea (diff) | |
| parent | 1d832618a4340526092fce9e49f4580f767e1526 (diff) | |
| download | volse-hubzilla-fcf8f301e595444620f07ea0e01994ea99ee961b.tar.gz volse-hubzilla-fcf8f301e595444620f07ea0e01994ea99ee961b.tar.bz2 volse-hubzilla-fcf8f301e595444620f07ea0e01994ea99ee961b.zip | |
Merge pull request #327 from fabrixxm/master
events: fix select events query
| -rwxr-xr-x[-rw-r--r--] | include/oembed.php | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | mod/events.php | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | view/oembed_video.tpl | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/oembed.php b/include/oembed.php index 1f45d2814..e2504b7eb 100644..100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -65,7 +65,8 @@ function oembed_fetch_url($embedurl){ } function oembed_format_object($j){ - $embedurl = $j->embedurl; + $a = get_app(); + $embedurl = $j->embedurl; $jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) ); $ret="<span class='oembed ".$j->type."'>"; switch ($j->type) { @@ -78,6 +79,7 @@ function oembed_format_object($j){ $th=120; $tw = $th*$tr; $tpl=get_markup_template('oembed_video.tpl'); $ret.=replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), '$embedurl'=>$embedurl, '$escapedhtml'=>base64_encode($jhtml), '$tw'=>$tw, diff --git a/mod/events.php b/mod/events.php index 069046ff9..2a6fb692e 100644..100755 --- a/mod/events.php +++ b/mod/events.php @@ -230,8 +230,8 @@ function events_content(&$a) { $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` WHERE `event`.`uid` = %d - AND (( `adjust` = 0 AND `start` >= '%s' AND `start` <= '%s' ) - OR ( `adjust` = 1 AND `start` >= '%s' AND `start` <= '%s' )) ", + AND (( `adjust` = 0 AND `finish` >= '%s' AND `start` <= '%s' ) + OR ( `adjust` = 1 AND `finish` >= '%s' AND `start` <= '%s' )) ", intval(local_user()), dbesc($start), dbesc($finish), diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl index 5824d8d4e..d3a9a9311 100644..100755 --- a/view/oembed_video.tpl +++ b/view/oembed_video.tpl @@ -1,4 +1,4 @@ <a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'> <img width='$tw' height='$th' src='$turl' > - <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> + <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div> </a> |