natto1784/aslichan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'noko50-new-dev11' of http://github.com/fallenPineapple/Tinyboard

Browse Source 
Conflicts:
	inc/functions.php
This commit is contained in:
czaks
2013-08-11 17:49:29 -04:00
parent 500468336e a4e97c32ec
commit 8534e2cc80
7 changed files with 156 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
inc/display.php
View File

@@ -426,6 +426,9 @@ class Thread {
public function add(Post $post) {
$this->posts[] = $post;
}
public function postCount() {
return count($this->posts) + $this->omitted;
}
public function postControls() {
global $board, $config;
@@ -497,10 +500,12 @@ class Thread {
return fraction($this->filex, $this->filey, ':');
}
public function build($index=false) {
public function build($index=false, $isnoko50=false) {
global $board, $config, $debug;
$built = Element('post_thread.html', array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index));
$hasnoko50 = $this->postCount() >= $config['noko50_min'];
$built = Element('post_thread.html', array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'hasnoko50' => $hasnoko50, 'isnoko50' => $isnoko50));
return $built;
}