mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-01 05:55:02 +03:00
fix Jevix по <br> в тегах <ul> - необходимо протестировать!
This commit is contained in:
parent
883b179b48
commit
d293bbc058
9
classes/lib/external/Jevix/jevix.class.php
vendored
9
classes/lib/external/Jevix/jevix.class.php
vendored
|
@ -106,6 +106,7 @@ class Jevix{
|
|||
protected $curCh;
|
||||
protected $curChOrd;
|
||||
protected $curChClass;
|
||||
protected $curParentTag;
|
||||
protected $states;
|
||||
protected $quotesOpened = 0;
|
||||
protected $brAdded = 0;
|
||||
|
@ -123,7 +124,6 @@ class Jevix{
|
|||
public $outBuffer = '';
|
||||
public $errors;
|
||||
|
||||
|
||||
/**
|
||||
* Константы для класификации тегов
|
||||
*
|
||||
|
@ -808,6 +808,7 @@ class Jevix{
|
|||
}
|
||||
|
||||
protected function makeTag($tag, $params, $content, $short, $parentTag = null){
|
||||
$this->curParentTag=$parentTag;
|
||||
$tag = strtolower($tag);
|
||||
|
||||
// Получаем правила фильтрации тега
|
||||
|
@ -1194,7 +1195,11 @@ class Jevix{
|
|||
} elseif ($this->isAutoBrMode && $this->skipNL($brCount)){
|
||||
// Перенос строки
|
||||
$br = $this->br.$this->nl;
|
||||
$text.= $brCount == 1 ? $br : $br.$br;
|
||||
if (in_array($this->curParentTag,array('ul')) and (is_null($this->openedTag) or $this->curParentTag==$this->openedTag)) {
|
||||
// пропускаем <br/>
|
||||
} else {
|
||||
$text.= $brCount == 1 ? $br : $br.$br;
|
||||
}
|
||||
// Помечаем что новая строка и новое слово
|
||||
$newLine = true;
|
||||
$newWord = true;
|
||||
|
|
Loading…
Reference in a new issue