flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:flashwave/sakura

Browse source
This commit is contained in:
flash 2015-12-04 15:19:34 +01:00
commit fd6baecb7d
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/Forum/Posting.php
View file

@ -17,7 +17,7 @@ use Sakura\BBcode;
class Posting class Posting
{ {
// Construct a new post action // Construct a new post action
public function __construct($forum, $thread = null) { public function __construct($forum, $thread = null)
{
} }
} }

6
libraries/Forum/Thread.php
View file

@ -75,12 +75,14 @@ class Thread
} }
// Get the opening post // Get the opening post
public function firstPost() { public function firstPost()
{
return $this->posts() ? array_values($this->_posts)[0] : (new Post(0)); return $this->posts() ? array_values($this->_posts)[0] : (new Post(0));
} }
// Get the last reply // Get the last reply
public function lastPost() { public function lastPost()
{
return $this->posts() ? end($this->_posts) : (new Post(0)); return $this->posts() ? end($this->_posts) : (new Post(0));
} }

4
libraries/Main.php
View file

@ -780,10 +780,10 @@ class Main
$parts = explode('<code>', $text); $parts = explode('<code>', $text);
$newStr = ''; $newStr = '';
if(count($parts) > 1) { if (count($parts) > 1) {
foreach ($parts as $p) { foreach ($parts as $p) {
$parts2 = explode('</code>', $p); $parts2 = explode('</code>', $p);
if(count($parts2) > 1) { if (count($parts2) > 1) {
$code = str_replace('<br />', '', $parts2[0]); $code = str_replace('<br />', '', $parts2[0]);
$code = str_replace('<br/>', '', $code); $code = str_replace('<br/>', '', $code);
$code = str_replace('<br>', '', $code); $code = str_replace('<br>', '', $code);

2
sakura.php
View file

@ -27,7 +27,7 @@ if (version_compare(phpversion(), '5.4.0', '<')) {
} }
// Include third-party libraries // Include third-party libraries
if(!@include_once ROOT . 'vendor/autoload.php') { if (!@include_once ROOT . 'vendor/autoload.php') {
die('<h3>Autoloader not found, did you run composer?</h3>'); die('<h3>Autoloader not found, did you run composer?</h3>');
} }