Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php

include/identity.php

@@ -630,7 +630,6 @@ function identity_export_year($channel_id,$year) {
 }
 
 
-
 /**
  * @brief Loads a profile into the App structure.
  *

include/items.php

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

include/widgets.php

@@ -380,6 +380,7 @@ function widget_categories($arr) {
 	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
 
 	return categories_widget($srchurl, $cat);
+
 }
 
 function widget_tagcloud_wall($arr) {

index.php

@@ -195,6 +195,17 @@ if(strlen($a->module)) {
 		}
 	}
 
+	/**
+	 * This provides a place for plugins to register module handlers which don't otherwise exist on the system.
+	 * If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if
+	 * there is no specific module file or matching plugin name.
+	 * The plugin should catch at least one of the module hooks for this URL. 
+	 */
+
+	$x = array('module' => $a->module, 'installed' => false);
+	call_hooks('module_loaded', $x);
+	if($x['installed'])
+		$a->module_loaded = true;
 
 	/**
 	 * The URL provided does not resolve to a valid module.

version.inc

@@ -1 +1 @@
-2015-07-15.1094
+2015-07-19.1098

view/tpl/photo_view.tpl

@@ -2,7 +2,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-
 			{{if $tools}}
 			<a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
 			{{/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>
 			</div>
 			{{/if}}
-
 			<div class="btn-group btn-group dropdown">
 				{{if $edit}}
 				<i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
@@ -29,11 +27,8 @@
 				{{/if}}
 			</div>
 		</div>
-
 		<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
-
 		<div class="clear"></div>
-
 	</div>
 	<div id="photo-map">
 	{{$map}}
@@ -88,12 +83,9 @@
 		</form>
 		<div id="photo-edit-end" class="clear"></div>
 	</div>
-
 	<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-end" class="clear"></div>
-
 		{{if $tags}}
 		<div class="photo-item-tools-left" id="in-this-photo">
 			<span id="in-this-photo-text">{{$tag_hdr}}</span>
@@ -102,9 +94,7 @@
 			{{/foreach}}
 		</div>
 		{{/if}}
-
 		<div class="photo-item-tools">
-
 			{{if $responses.count }}
 			<div class="photo-item-tools-left pull-left">
 				<div class="{{if $responses.count > 1}}btn-group{{/if}}">
@@ -139,8 +129,8 @@
 					{{/if}}
 				{{/foreach}}
 				</div>
-		{{/if}}
 			</div>
+			{{/if}}
 			{{if $likebuttons}}
 			<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">
@@ -154,17 +144,14 @@
 			{{/if}}
 			<div class="clear"></div>
 		</div>
-
+	</div>
 	{{$comments}}
-
 	{{if $commentbox}}
 	<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
 		{{$commentbox}}
 	</div>
 	{{/if}}
-
 	<div class="clear"></div>
 </div>
-
 {{$paginate}}