@@ -1284,12 +1284,10 @@ discard block |
||
1284 | 1284 | if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches)) |
1285 | 1285 | { |
1286 | 1286 | $emphasis = 'strong'; |
1287 | - } |
|
1288 | - elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches)) |
|
1287 | + } elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches)) |
|
1289 | 1288 | { |
1290 | 1289 | $emphasis = 'em'; |
1291 | - } |
|
1292 | - else |
|
1290 | + } else |
|
1293 | 1291 | { |
1294 | 1292 | return; |
1295 | 1293 | } |
@@ -1380,8 +1378,7 @@ discard block |
||
1380 | 1378 | $extent += strlen($matches[0]); |
1381 | 1379 | |
1382 | 1380 | $remainder = substr($remainder, $extent); |
1383 | - } |
|
1384 | - else |
|
1381 | + } else |
|
1385 | 1382 | { |
1386 | 1383 | return; |
1387 | 1384 | } |
@@ -1396,8 +1393,7 @@ discard block |
||
1396 | 1393 | } |
1397 | 1394 | |
1398 | 1395 | $extent += strlen($matches[0]); |
1399 | - } |
|
1400 | - else |
|
1396 | + } else |
|
1401 | 1397 | { |
1402 | 1398 | if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches)) |
1403 | 1399 | { |
@@ -1405,8 +1401,7 @@ discard block |
||
1405 | 1401 | $definition = strtolower($definition); |
1406 | 1402 | |
1407 | 1403 | $extent += strlen($matches[0]); |
1408 | - } |
|
1409 | - else |
|
1404 | + } else |
|
1410 | 1405 | { |
1411 | 1406 | $definition = strtolower($Element['handler']['argument']); |
1412 | 1407 | } |
@@ -1571,8 +1566,7 @@ discard block |
||
1571 | 1566 | $argument = $Element['text']; |
1572 | 1567 | unset($Element['text']); |
1573 | 1568 | $destination = 'rawHtml'; |
1574 | - } |
|
1575 | - else |
|
1569 | + } else |
|
1576 | 1570 | { |
1577 | 1571 | $function = $Element['handler']['function']; |
1578 | 1572 | $argument = $Element['handler']['argument']; |
@@ -1609,8 +1603,7 @@ discard block |
||
1609 | 1603 | if (isset($Element['elements'])) |
1610 | 1604 | { |
1611 | 1605 | $Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']); |
1612 | - } |
|
1613 | - elseif (isset($Element['element'])) |
|
1606 | + } elseif (isset($Element['element'])) |
|
1614 | 1607 | { |
1615 | 1608 | $Element['element'] = $this->elementApplyRecursive($closure, $Element['element']); |
1616 | 1609 | } |
@@ -1623,8 +1616,7 @@ discard block |
||
1623 | 1616 | if (isset($Element['elements'])) |
1624 | 1617 | { |
1625 | 1618 | $Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']); |
1626 | - } |
|
1627 | - elseif (isset($Element['element'])) |
|
1619 | + } elseif (isset($Element['element'])) |
|
1628 | 1620 | { |
1629 | 1621 | $Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']); |
1630 | 1622 | } |
@@ -1711,26 +1703,22 @@ discard block |
||
1711 | 1703 | if (isset($Element['elements'])) |
1712 | 1704 | { |
1713 | 1705 | $markup .= $this->elements($Element['elements']); |
1714 | - } |
|
1715 | - elseif (isset($Element['element'])) |
|
1706 | + } elseif (isset($Element['element'])) |
|
1716 | 1707 | { |
1717 | 1708 | $markup .= $this->element($Element['element']); |
1718 | - } |
|
1719 | - else |
|
1709 | + } else |
|
1720 | 1710 | { |
1721 | 1711 | if (!$permitRawHtml) |
1722 | 1712 | { |
1723 | 1713 | $markup .= self::escape($text, true); |
1724 | - } |
|
1725 | - else |
|
1714 | + } else |
|
1726 | 1715 | { |
1727 | 1716 | $markup .= $text; |
1728 | 1717 | } |
1729 | 1718 | } |
1730 | 1719 | |
1731 | 1720 | $markup .= $hasName ? '</' . $Element['name'] . '>' : ''; |
1732 | - } |
|
1733 | - elseif ($hasName) |
|
1721 | + } elseif ($hasName) |
|
1734 | 1722 | { |
1735 | 1723 | $markup .= ' />'; |
1736 | 1724 | } |
@@ -1896,8 +1884,7 @@ discard block |
||
1896 | 1884 | if ($len > strlen($string)) |
1897 | 1885 | { |
1898 | 1886 | return false; |
1899 | - } |
|
1900 | - else |
|
1887 | + } else |
|
1901 | 1888 | { |
1902 | 1889 | return strtolower(substr($string, 0, $len)) === strtolower($needle); |
1903 | 1890 | } |