Merge remote-tracking branch 'origin/master' into 0.7.0

src/socket.io/groups.js

@@ -123,8 +123,13 @@ SocketGroups.delete = function(socket, data, callback) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
-	groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
-		if (!isOwner) {
+	var tasks = {
+			isOwner: async.apply(groups.ownership.isOwner, socket.uid, data.groupName),
+			isAdmin: async.apply(user.isAdministrator, socket.uid)
+		};
+
+	async.parallel(tasks, function(err, checks) {
+		if (!checks.isOwner && !checks.isAdmin) {
 			return callback(new Error('[[error:no-privileges]]'));
 		}
 

src/socket.io/index.js

@@ -314,13 +314,15 @@ Sockets.getUsersInRoom = function (uid, roomName, callback) {
 	});
 };
 
-Sockets.getUidsInRoom = function(roomName) {
+Sockets.getUidsInRoom = function(roomName, callback) {
+	callback = callback || function() {};
 	// TODO : doesnt work in cluster
 
 	var uids = [];
 
 	var socketids = Object.keys(io.sockets.adapter.rooms[roomName] || {});
 	if (!Array.isArray(socketids) || !socketids.length) {
+		callback(null, []);
 		return [];
 	}
 
@@ -334,7 +336,7 @@ Sockets.getUidsInRoom = function(roomName) {
 			});
 		}
 	}
-
+	callback(null, uids);
 	return uids;
 };
 

src/views/admin/manage/flags.tpl

@@ -25,8 +25,8 @@
 							</div>
 							<small>
 								<span class="pull-right footer">
-									Posted in <a href="{relative_path}/category/{posts.category.slug}"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>, <span class="timeago" title="{posts.relativeTime}"></span> &bull;
-									<a href="{relative_path}/topic/{posts.topic.slug}/{posts.index}">Read More</a>
+									Posted in <a href="{relative_path}/category/{posts.category.slug}" target="_blank"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>, <span class="timeago" title="{posts.relativeTime}"></span> &bull;
+									<a href="{relative_path}/topic/{posts.topic.slug}/{posts.index}" target="_blank">Read More</a>
 								</span>
 							</small>
 						</div>