harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos

Browse Source
This commit is contained in:
Mario Vavti 2015-07-16 22:04:52 +02:00
parent 5506f178a5
commit 39a09eb525
2 changed files with 37 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -2657,11 +2657,12 @@ function item_store_update($arr,$allow_exec = false) {
return $ret; return $ret;
} }
if(is_array($terms)) {
$r = q("delete from term where oid = %d and otype = %d", $r = q("delete from term where oid = %d and otype = %d",
intval($orig_post_id), intval($orig_post_id),
intval(TERM_OBJ_POST) intval(TERM_OBJ_POST)
); );
if(is_array($terms)) {
foreach($terms as $t) { foreach($terms as $t) {
q("insert into term (uid,oid,otype,type,term,url) q("insert into term (uid,oid,otype,type,term,url)
values(%d,%d,%d,%d,'%s','%s') ", values(%d,%d,%d,%d,'%s','%s') ",
@ -2673,7 +2674,6 @@ function item_store_update($arr,$allow_exec = false) {
dbesc($t['url']) dbesc($t['url'])
); );
} }
$arr['term'] = $terms; $arr['term'] = $terms;
} }

17
view/tpl/photo_view.tpl
View File

@ -2,7 +2,6 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<div class="pull-right"> <div class="pull-right">
{{if $tools}} {{if $tools}}
<a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a> <a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
{{/if}} {{/if}}
@ -11,7 +10,6 @@
<i class="icon-globe btn btn-default btn-xs" title="{{$map_text}}" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); }" ></i> <i class="icon-globe btn btn-default btn-xs" title="{{$map_text}}" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); }" ></i>
</div> </div>
{{/if}} {{/if}}
<div class="btn-group btn-group dropdown"> <div class="btn-group btn-group dropdown">
{{if $edit}} {{if $edit}}
<i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i> <i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
@ -29,11 +27,8 @@
{{/if}} {{/if}}
</div> </div>
</div> </div>
<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2> <h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="photo-map"> <div id="photo-map">
{{$map}} {{$map}}
@ -88,12 +83,9 @@
</form> </form>
<div id="photo-edit-end" class="clear"></div> <div id="photo-edit-end" class="clear"></div>
</div> </div>
<div id="photo-view-wrapper"> <div id="photo-view-wrapper">
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div> <div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
<div id="photo-photo-end" class="clear"></div> <div id="photo-photo-end" class="clear"></div>
{{if $tags}} {{if $tags}}
<div class="photo-item-tools-left" id="in-this-photo"> <div class="photo-item-tools-left" id="in-this-photo">
<span id="in-this-photo-text">{{$tag_hdr}}</span> <span id="in-this-photo-text">{{$tag_hdr}}</span>
@ -102,9 +94,7 @@
{{/foreach}} {{/foreach}}
</div> </div>
{{/if}} {{/if}}
<div class="photo-item-tools"> <div class="photo-item-tools">
{{if $responses.count }} {{if $responses.count }}
<div class="photo-item-tools-left pull-left"> <div class="photo-item-tools-left pull-left">
<div class="{{if $responses.count > 1}}btn-group{{/if}}"> <div class="{{if $responses.count > 1}}btn-group{{/if}}">
@ -139,8 +129,8 @@
{{/if}} {{/if}}
{{/foreach}} {{/foreach}}
</div> </div>
{{/if}}
</div> </div>
{{/if}}
{{if $likebuttons}} {{if $likebuttons}}
<div class="photo-item-tools-right btn-group pull-right"> <div class="photo-item-tools-right btn-group pull-right">
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false"> <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
@ -154,17 +144,14 @@
{{/if}} {{/if}}
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div>
{{$comments}} {{$comments}}
{{if $commentbox}} {{if $commentbox}}
<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > <div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
{{$commentbox}} {{$commentbox}}
</div> </div>
{{/if}} {{/if}}
<div class="clear"></div> <div class="clear"></div>
</div> </div>
{{$paginate}} {{$paginate}}