1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-25 07:50:23 +01:00

Merge branch 'master' of https://github.com/TheHowl/8chan into TheHowl-master

Conflicts:
	create.php
This commit is contained in:
8chan 2014-09-25 20:28:46 +00:00
commit e1ce037c8c
2 changed files with 5 additions and 1 deletions

View File

@ -1633,3 +1633,7 @@
'<a href="$0" target="_blank" class="file">'.
'<img style="width:360px;height:270px;" src="//img.youtube.com/vi/$2/0.jpg" class="post-image"/>'.
'</a></div>';
// Set to true to use ayah. Requires to set inc/lib/ayah/ayah_config.php!
// Ayah is highly reccommended (it's also used only for creating boards)
$config["use_ayah"] = false;

View File

@ -15,7 +15,7 @@
$boards = listBoards(TRUE);
}
$body = Element('search_form.html', Array('boards' => $boards, 'board' => isset($_GET['board']) ? $_GET['board'] : false, 'search' => isset($_GET['search']) ? str_replace('"', '&quot;', utf8tohtml($_GET['search'])) : false));
$body = Element('search_form.html', Array('boards' => $boards, 'b' => isset($_GET['board']) ? $_GET['board'] : false, 'search' => isset($_GET['search']) ? str_replace('"', '&quot;', utf8tohtml($_GET['search'])) : false));
if(isset($_GET['search']) && !empty($_GET['search']) && isset($_GET['board']) && in_array($_GET['board'], $boards)) {
$phrase = $_GET['search'];