Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	inc/functions.php
	inc/mod/pages.php
	install.php
	js/expand.js
	mod.php

js/expand.js

@@ -3,7 +3,7 @@
  * https://github.com/savetheinternet/Tinyboard/blob/master/js/expand.js
  *
  * Released under the MIT license
- * Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
+ * Copyright (c) 2012-2013 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
@@ -35,10 +35,8 @@ $(document).ready(function(){
 									$(this).addClass('expanded').insertAfter(thread.find('div.post:first')).after('<br class="expanded">');
 								}
 								last_expanded = $(this);
-								
 								$(document).trigger('new_post', this);
-							}
-							else {
+							} else {
 								last_expanded = post_in_doc;
 							}
 						});

js/inline-expanding.js

@@ -21,7 +21,7 @@ onready(function(){
 				link[i].onclick = function(e) {
 					if (this.childNodes[0].className == 'hidden')
 						return false;
-					if (e.which == 2)
+					if (e.which == 2 || e.metaKey)
 						return true;
 					if (!this.dataset.src) {
 						this.dataset.expanded = 'true';