Merge ../http

Conflicts:
	templates/themes/catalog/catalog.html

inc/instance-config.php

@@ -84,6 +84,7 @@
 	$config['mod']['recent_reports'] = 65535;
 
 	// Board shit
+	$config['max_links'] = 40;
 	$config['poster_id_length'] = 6;
 	$config['ayah_enabled'] = true;
 	$config['url_banner'] = '/banners.php';

post.php

@@ -194,7 +194,7 @@ if (isset($_POST['delete'])) {
 
 	if (!(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
 		(!$post['op'] && $_POST['post'] == $config['button_reply'])))
-		error($config['error']['bot']);
+		//error($config['error']['bot']);
 	
 	// Check the referrer
 	if ($config['referer_match'] !== false &&

templates/8chan/index.html

@@ -288,6 +288,7 @@
         <div class="col col-9 bodyCol">
           <div class="content_body">
             <p>{% trans %}On ∞chan, you can create your own imageboard for free with no experience or programming knowledge needed. As long as the admin logs in once per week and it gets one new post every 72 hours, the board will be hosted forever.{% endtrans %}</p>
+            <p style="color:red">{% trans %}Warning: Some boards on this site might contain content of an adult or offensive nature. Please cease use of this site if it is illegal for you to view such content. The boards on this site are made entirely by the users and do not represent the opinions of the administration of 8chan.co. In the interest of free speech, only content that directly violates the DMCA or other US laws is deleted.{% endtrans %}</p>
             <div class="mobileHide">
               <a href="create.php" class="button">{% trans %}Create&nbsp;your&nbsp;board{% endtrans %}</a>
               <a href="boards.html" class="button">{% trans %}Browse&nbsp;existing&nbsp;boards{% endtrans %}</a>