diff options
| author | Michael Save <savetheinternet@tinyboard.org> | 2012-08-27 02:28:04 +1000 |
|---|---|---|
| committer | Michael Save <savetheinternet@tinyboard.org> | 2012-08-27 02:28:04 +1000 |
| commit | 6a705fd8c2324b642ac6bfc660d76cff6d5eab62 (patch) | |
| tree | 7f916bebf46f66ed55569ea1456686524aebc192 /templates/themes/frameset | |
| parent | 1dcb385e9e3791d2d3c1d049fe9b8d906539088e (diff) | |
| parent | c919e7362542117f613c2800017ae89c269a07b5 (diff) | |
Merge branch 'mod-rewrite'
Conflicts:
inc/lib/Twig/Extensions/Extension/Tinyboard.php
install.php
mod.php
stylesheets/style.css
templates/index.html
templates/page.html
templates/thread.html
Diffstat (limited to 'templates/themes/frameset')
| -rw-r--r-- | templates/themes/frameset/sidebar.html | 2 | ||||
| -rw-r--r-- | templates/themes/frameset/theme.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/themes/frameset/sidebar.html b/templates/themes/frameset/sidebar.html index 457ecec8..40e2d719 100644 --- a/templates/themes/frameset/sidebar.html +++ b/templates/themes/frameset/sidebar.html @@ -30,7 +30,7 @@ {% for board in boards %} <li> <a href="{{ config.board_path|sprintf(board.uri) }}"> - {{ board.title }} + {{ board.title|e }} </a> </li> {% endfor %} diff --git a/templates/themes/frameset/theme.php b/templates/themes/frameset/theme.php index f3e1b139..015eebaf 100644 --- a/templates/themes/frameset/theme.php +++ b/templates/themes/frameset/theme.php @@ -15,13 +15,13 @@ public static function build($action, $settings) { global $config; - if($action == 'all') + if ($action == 'all') file_write($config['dir']['home'] . $settings['file_main'], Frameset::homepage($settings)); - if($action == 'all' || $action == 'boards') + if ($action == 'all' || $action == 'boards') file_write($config['dir']['home'] . $settings['file_sidebar'], Frameset::sidebar($settings)); - if($action == 'all' || $action == 'news') + if ($action == 'all' || $action == 'news') file_write($config['dir']['home'] . $settings['file_news'], Frameset::news($settings)); } |