Adapt stuff using RSSBuilder to new library location

mantisbt · May 17, 2009 · 5cc9385 · 5cc9385
1 parent 0ebee35
commit 5cc9385
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/core.php b/core.php
@@ -106,23 +106,14 @@
 	function __autoload( $className ) {
 		global $g_core_path;
 
-		switch ( $className ) {
-			case 'DisposableEmailChecker':
-				require_once( $g_core_path . 'disposable' . DIRECTORY_SEPARATOR . 'disposable.php' );
-				return;
-			case 'PHPMailer':
-				require_once( PHPMAILER_PATH . 'class.phpmailer.php' ); // phpmailer_path is defined in email api
-				return;
-		}
-
 		$t_require_path = $g_core_path . 'classes' . DIRECTORY_SEPARATOR . $className . '.class.php';
 
 		if ( file_exists( $t_require_path ) ) {
 			require_once( $t_require_path );
 			return;
 		}
 
-		$t_require_path = $g_core_path . 'rssbuilder' . DIRECTORY_SEPARATOR . 'class.' . $className . '.inc.php';
+		$t_require_path = BASE_PATH . '/library/rssbuilder/class.' . $className . '.inc.php';
 
 		if ( file_exists( $t_require_path ) ) {
 			require_once( $t_require_path );

diff --git a/issues_rss.php b/issues_rss.php
@@ -36,7 +36,7 @@
 
 	$t_core_path = config_get( 'core_path' );
 
-	require_once( $t_core_path . 'rssbuilder/class.RSSBuilder.inc.php' );
+	require_once( 'rssbuilder/class.RSSBuilder.inc.php' );
 	require_once( $t_core_path . 'user_api.php' );
 	require_once( $t_core_path . 'filter_api.php' );
 	require_once( $t_core_path . 'rss_api.php' );

diff --git a/news_rss.php b/news_rss.php
@@ -27,7 +27,7 @@
 
 	$t_core_path = config_get( 'core_path' );
 
-	require_once( $t_core_path . 'rssbuilder/class.RSSBuilder.inc.php' );
+	require_once( 'rssbuilder/class.RSSBuilder.inc.php' );
 	require_once( $t_core_path . 'news_api.php' );
 	require_once( $t_core_path . 'project_api.php' );
 	require_once( $t_core_path . 'print_api.php' );