Version 3.4.6
This commit is contained in:
1 parent
e4478369d8
commit
b45ea0dffb
1568 files changed
+155104
-161665
No files matched your search
@@ -3,10 +3,10 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.5
|
||||
* IP.Board v3.4.6
|
||||
* RSS Import
|
||||
* Owner: Matt Mecham
|
||||
* Last Updated: $Date: 2013-05-16 11:23:35 -0400 (Thu, 16 May 2013) $
|
||||
* Last Updated: $Date: 2013-09-26 22:37:28 -0400 (Thu, 26 Sep 2013) $
|
||||
* </pre>
|
||||
*
|
||||
* @author Matt Mecham
|
||||
@@ -15,7 +15,7 @@
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @since 24th November 2009
|
||||
* @version $Revision: 12255 $
|
||||
* @version $Revision: 12370 $
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -219,26 +219,26 @@ class rss_import
|
||||
|
||||
ipsRegistry::getClass('class_localization')->loadLanguageFile( array( 'public_global' ), 'core' );
|
||||
|
||||
/* Are we checking for external links */
|
||||
$rels = array();
|
||||
$rel = '';
|
||||
|
||||
if( ipsRegistry::$settings['posts_add_nofollow'] )
|
||||
{
|
||||
$rels[] = "nofollow";
|
||||
}
|
||||
|
||||
if( ipsRegistry::$settings['links_external'] )
|
||||
{
|
||||
$rels[] = "external";
|
||||
}
|
||||
|
||||
if( count($rels) )
|
||||
{
|
||||
$rel = " rel='" . implode( ' ', $rels ) . "'";
|
||||
/* Are we checking for external links */
|
||||
$rels = array();
|
||||
$rel = '';
|
||||
|
||||
if( ipsRegistry::$settings['posts_add_nofollow'] )
|
||||
{
|
||||
$rels[] = "nofollow";
|
||||
}
|
||||
|
||||
$this->_settings['LinkBack'] = "<a href=\"{url}\" {$rel}>" . $this->registry->getClass('class_localization')->words['_rssimportsource'] . "</a>";
|
||||
if( ipsRegistry::$settings['links_external'] )
|
||||
{
|
||||
$rels[] = "external";
|
||||
}
|
||||
|
||||
if( count($rels) )
|
||||
{
|
||||
$rel = " rel='" . implode( ' ', $rels ) . "'";
|
||||
}
|
||||
|
||||
$this->_settings['LinkBack'] = "<a href=\"{url}\" class='bbc_url' {$rel}>" . $this->registry->getClass('class_localization')->words['_rssimportsource'] . "</a>";
|
||||
|
||||
/* Reset class */
|
||||
$this->_reset();
|
||||
@@ -566,7 +566,7 @@ class rss_import
|
||||
if ( ! $this->_settings['ParseHtml'] )
|
||||
{
|
||||
$_raw = stripslashes($content);
|
||||
|
||||
|
||||
$content = IPSText::getTextClass( 'bbcode' )->preDbParse( $editor->process( $_raw ) );
|
||||
}
|
||||
else
|
||||
@@ -579,7 +579,7 @@ class rss_import
|
||||
{
|
||||
$the_link = str_replace( '{url}', trim( $link ), $this->_settings['LinkBack'] );
|
||||
|
||||
if ( $this->_settings['ParseHtml'] )
|
||||
if ( !$this->_settings['ParseHtml'] )
|
||||
{
|
||||
$_raw = IPSText::getTextClass( 'bbcode' )->preEditParse( stripslashes($the_link) );
|
||||
|
||||
|
||||
Reference in new issue
Block a user