Version 4.7.6
This commit is contained in:
1 parent
8ba7d43898
commit
7b7404e741
1085 files changed
+30590
-7837
No files matched your search
@@ -1254,7 +1254,7 @@ class _Parser
|
||||
/* If we have any acronyms, they also need to be breakpoints */
|
||||
if ( \count( $this->caseSensitiveAcronyms ) or \count( $this->caseInsensitiveAcronyms ) )
|
||||
{
|
||||
$breakPoints[] = '((?=<^|\b)(?:' . implode( '|', array_merge( array_map( function ( $value ) { return preg_quote( $value, '/' ); }, array_keys( $this->caseSensitiveAcronyms ) ), array_map( function ( $value ) { return preg_quote( $value, '/' ); }, array_keys( $this->caseInsensitiveAcronyms ) ) ) ) . ')(?=\b|$))';
|
||||
$breakPoints[] = '((?=<^|\b|\W)(?:' . implode( '|', array_merge( array_map( function ( $value ) { return preg_quote( $value, '/' ); }, array_keys( $this->caseSensitiveAcronyms ) ), array_map( function ( $value ) { return preg_quote( $value, '/' ); }, array_keys( $this->caseInsensitiveAcronyms ) ) ) ) . ')(?=\b|\W|$))';
|
||||
}
|
||||
|
||||
/* Loop through each section */
|
||||
@@ -1927,10 +1927,13 @@ class _Parser
|
||||
/* Or an attachment? */
|
||||
elseif ( $attachment = static::_getAttachment( $element->getAttribute($srcAttribute ), $element->hasAttribute('data-fileid') ? $element->getAttribute('data-fileid') : NULL ) )
|
||||
{
|
||||
$file = $this->_getFile( 'core_Attachment', $element->getAttribute( $srcAttribute ) );
|
||||
|
||||
$element->setAttribute( 'data-fileid', $attachment['attach_id'] );
|
||||
$element->setAttribute( 'src', str_replace( array( 'http:', 'https:' ), '', str_replace( static::$fileObjectClasses['core_Attachment']->baseUrl(), '{fileStore.core_Attachment}', $element->getAttribute( $srcAttribute ) ) ) );
|
||||
|
||||
if ( ! empty( $attachment['attach_labels'] ) and $labels = static::getAttachmentLabels( $attachment ) )
|
||||
|
||||
if ( ( !$element->hasAttribute('alt') or $element->getAttribute('alt') == $file->filename ) and ! empty( $attachment['attach_labels'] ) and $labels = static::getAttachmentLabels( $attachment ) )
|
||||
{
|
||||
if ( \count( $labels ) )
|
||||
{
|
||||
@@ -2285,12 +2288,6 @@ class _Parser
|
||||
{
|
||||
$rels = array();
|
||||
|
||||
/* norewrite */
|
||||
if ( \IPS\Settings::i()->viglink_norewrite and $this->member->inGroup( explode( ',', \IPS\Settings::i()->viglink_norewrite ) ) )
|
||||
{
|
||||
$rels[] = 'norewrite';
|
||||
}
|
||||
|
||||
/* We add external/nofollow rel attributes for non-internal non-local links */
|
||||
if ( !( $url instanceof \IPS\Http\Url\Internal ) )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user