Revert "Merge branch 'master' of github.com:vichan-devel/Tinyboard"

This reverts commit a84c4510fccfdc0cfb6f187633daea10dc70f326, reversing
changes made to a8327c3a37fd22d2aa5d63061c9d3eaa30ae425a.

6 files changed, 4 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index eee0e4e4..73c05be2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,3 @@
 thumbs.db

 Icon?

 Thumbs.db

-

-#vichan custom

-favicon.ico

-/static/spoiler.png

diff --git a/inc/config.php b/inc/config.php
index 54b60bf3..cddbf074 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1327,3 +1327,4 @@
 
 	// Complex regular expression to catch URLs.
 	$config['url_regex'] = '/' . '(https?|ftp):\/\/' . '(([\w\-]+\.)+[a-zA-Z]{2,6}|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' . '(:\d+)?' . '(\/([\w\-~.#\/?=&;:+%!*\[\]@$\'()+,|\^]+)?)?' . '/';
+
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index b3f09a66..706d747d 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1328,6 +1328,7 @@ function mod_delete($board, $post) {
 	if (!hasPermission($config['mod']['delete'], $board))
 		error($config['error']['noaccess']);
 	
+	// Delete post
 	deletePost($post);
 	// Record the action
 	modLog("Deleted post #{$post}");
diff --git a/js/expand.js b/js/expand.js
index 44f5ae80..b13d0bcf 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -22,7 +22,7 @@ $(document).ready(function(){
 				var thread = $(this).parent().parent().parent();
 				var id = thread.attr('id').replace(/^thread_/, '');
 				$.ajax({
-					url: thread.find('p.intro a.post_no.p1:first').attr('href'),
+					url: thread.find('p.intro a.post_no:first').attr('href'),
 					context: document.body,
 					success: function(data) {
 						var last_expanded = false;
diff --git a/templates/boardlist.html b/templates/boardlist.html
index e69de29b..62646845 100644
--- a/templates/boardlist.html
+++ b/templates/boardlist.html
@@ -0,0 +1 @@
+I'm your overboard boardlist. You can put here anything and I reside in templates/boardlist.html
diff --git a/templates/post_form.html b/templates/post_form.html
index fa486263..12f1186b 100755..100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -128,41 +128,6 @@
 <input type="hidden" name="hash" value="{{ antibot.hash() }}">
 </form>
 
-<div style='float: left;' id='_waudiv'>
-<script id="_waukts">
-_waufun = function() {
-  $("#_wauscr").remove();
-  $("#_waudiv div").remove();
-
-  WAU_ren = undefined;
-  _wau = [["classic", "569e2sx122oe", "kts"]];
-
-  var s=document.createElement("script");
-  s.async=true;
-  s.id="_wauscr";
-  s.src="http://widgets.amung.us/classic.js?"+Math.random();
-  document.getElementsByTagName("head")[0].appendChild(s);
-  
-  setInterval(_waufun, 3600000);
-};
-
-_waufun();
-</script>
-</div>
-<div style='float: left; text-align: center; margin: 5px;'>
-<strong><a href='http://webchat.6irc.net/?channels=vichan-int-{{ board.uri }}&nick=Anon....'>
-IRC: #vichan-int-{{ board.uri }}</strong>
-<br><small>New thread preview live and discussion</small></a>
-</div>
-<div style='float: left; text-align: center; margin: 5px; width: 230px;'>
-<strong><a href='http://webchat.6irc.net/?channels=vichan-int-{{ board.uri }}-full&nick=Anon....'>
-IRC: #vichan-int-{{ board.uri }}-full</strong>
-<br><small>All new posts preview live</small></a>
-</div>
-
-
 <script type="text/javascript">{% raw %}
 	rememberStuff();
 {% endraw %}</script>
-
-