perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

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

Browse source 
Conflicts:
	inc/config.php
This commit is contained in:
czaks 2013-08-29 07:33:19 -04:00
commit 8de81d176c
6 changed files with 166 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

20
inc/config.php
View file

@ -464,10 +464,10 @@
*/
// "Wiki" markup syntax ($config['wiki_markup'] in pervious versions):
$config['markup'][] = array("/'''([^<]+?)'''/", "<strong>\$1</strong>");
$config['markup'][] = array("/''([^<]+?)''/", "<em>\$1</em>");
$config['markup'][] = array("/\*\*([^<]+?)\*\*/", "<span class=\"spoiler\">\$1</span>");
$config['markup'][] = array("/^[ |\t]*==([^<]+?)==[ |\t]*$/m", "<span class=\"heading\">\$1</span>");
$config['markup'][] = array("/'''(.+?)'''/", "<strong>\$1</strong>");
$config['markup'][] = array("/''(.+?)''/", "<em>\$1</em>");
$config['markup'][] = array("/\*\*(.+?)\*\*/", "<span class=\"spoiler\">\$1</span>");
$config['markup'][] = array("/^[ |\t]*==(.+?)==[ |\t]*$/m", "<span class=\"heading\">\$1</span>");
// Highlight PHP code wrapped in <code> tags (PHP 5.3+)
// $config['markup'][] = array(
@ -477,6 +477,16 @@
// }
// );
// Repair markup with HTML Tidy. This may be slower, but it solves nesting mistakes. Tinyboad, at the
// time of writing this, can not prevent out-of-order markup tags (eg. "**''test**'') without help from
// HTML Tidy.
$config['markup_repair_tidy'] = false;
// Always regenerate markup. This isn't recommended and should only be used for debugging; by default,
// Tinyboard only parses post markup when it needs to, and keeps post-markup HTML in the database. This
// will significantly impact performance when enabled.
$config['always_regenerate_markup'] = false;
/*
* ====================
* Image settings
@ -606,7 +616,7 @@
// Display the aspect ratio of uploaded files.
$config['show_ratio'] = false;
// Display the file's original filename.
$config['show_filename']= true;
$config['show_filename'] = true;
// Display image identification links using regex.info/exif, TinEye and Google Images.
$config['image_identification'] = false;