kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	inc/display.php
This commit is contained in:
czaks 2013-08-16 16:06:54 -04:00
commit ca565d07c2
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/display.php
View File

@ -354,6 +354,10 @@ class Post {
return $built;
}
public function ratio() {
return fraction($this->filewidth, $this->fileheight, ':');
}
public function build($index=false) {
global $board, $config;
@ -473,6 +477,10 @@ class Thread {
return $built;
}
public function ratio() {
return fraction($this->filewidth, $this->fileheight, ':');
}
public function build($index=false, $isnoko50=false) {
global $board, $config, $debug;

2
inc/mod/pages.php
View File

@ -1388,7 +1388,7 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
$query->bindValue(':subject', $_POST['subject']);
$query->bindValue(':body', $_POST['body']);
if ($edit_raw_html) {
$body_nomarkup = $_POST['body'] . '<tinyboard raw html>1</tinyboard>';
$body_nomarkup = $_POST['body'] . "\n<tinyboard raw html>1</tinyboard>";
$query->bindValue(':body_nomarkup', $body_nomarkup);
}
$query->execute() or error(db_error($query));

5
post.php
View File

@ -424,7 +424,7 @@ if (isset($_POST['delete'])) {
$post['body'] = escape_markup_modifiers($post['body']);
if ($mod && isset($post['raw']) && $post['raw']) {
$post['body'] .= '<tinyboard raw html>1</tinyboard>';
$post['body'] .= "\n<tinyboard raw html>1</tinyboard>";
}
if ($config['country_flags']) {
@ -432,7 +432,8 @@ if (isset($_POST['delete'])) {
error('GeoIP not available: ' . geoip_db_filename(GEOIP_COUNTRY_EDITION));
}
if ($country_code = @geoip_country_code_by_name($_SERVER['REMOTE_ADDR'])) {
$post['body'] .= '<tinyboard flag>' . strtolower($country_code) . '</tinyboard>';
$post['body'] .= "\n<tinyboard flag>" . strtolower($country_code) . "</tinyboard>" .
"\n<tinyboard flag alt>" . @geoip_country_name_by_name($_SERVER['REMOTE_ADDR']) . "</tinyboard>";
}
}

4
templates/post_reply.html
View File

@ -62,8 +62,8 @@
Spoiler Image,
{% endif %}
{{ post.filesize|filesize }}
{% if post.filex and post.filey %}
, {{ post.filex}}x{{ post.filey }}
{% if post.filewidth and post.fileheight %}
, {{ post.filewidth}}x{{ post.fileheight }}
{% if config.show_ratio %}
, {{ post.ratio }}
{% endif %}

4
templates/post_thread.html
View File

@ -14,8 +14,8 @@
{% trans %}Spoiler Image{% endtrans %},
{% endif %}
{{ post.filesize|filesize }}
{% if post.filex and post.filey %}
, {{ post.filex}}x{{ post.filey }}
{% if post.filewidth and post.fileheight %}
, {{ post.filewidth}}x{{ post.fileheight }}
{% if config.show_ratio %}
, {{ post.ratio }}
{% endif %}