privatize and clean up requireHandlerFile; use public getContentClassName when need to load a class

1 files changed, 12 insertions, 10 deletions

diff --git a/Pigeonholes.php b/Pigeonholes.php
index e2a8975..695ee52 100644
--- a/Pigeonholes.php
+++ b/Pigeonholes.php
@@ -192,16 +192,18 @@ class Pigeonholes extends LibertyMime {
 			if( !empty( $contentTypes[$aux['content_type_guid']] ) ) {
 				$type = &$contentTypes[$aux['content_type_guid']];
 				if( empty( $type['content_object'] ) ) {
-					// create *one* object for each object *type* to  call virtual methods.
-					include_once( $gBitSystem->mPackages[$type['handler_package']]['path'].$type['handler_file'] );
-					$type['content_object'] = new $type['handler_class']();
-				}
-				if( $type['content_object']->isViewable( $aux['content_id'] )) {
-					$aux['display_url']   = $type['content_object']->getDisplayUrlFromHash( $aux );
-					$aux['display_link']  = $type['content_object']->getDisplayLink( $aux );
-					$aux['title']         = $type['content_object']->getTitleFromHash( $aux );
-// needs updating to bw3					$aux['thumbnail_url'] = liberty_fetch_thumbnails( array());
-					$ret[] = $aux;
+					// crate *one* object for each object *type* to  call virtual methods.
+					if( $typeClass = $gLibertySystem->getContentClassName( $type['content_type_guid'] ) ) {
+						if( $type['content_object'] = new $typeClass() ) {
+							if( $type['content_object']->isViewable( $aux['content_id'] )) {
+								$aux['display_url']   = $type['content_object']->getDisplayUrlFromHash( $aux );
+								$aux['display_link']  = $type['content_object']->getDisplayLink( $aux );
+								$aux['title']         = $type['content_object']->getTitleFromHash( $aux );
+			// needs updating to bw3					$aux['thumbnail_url'] = liberty_fetch_thumbnails( array());
+								$ret[] = $aux;
+							}
+						}
+					}
 				}
 			}
 		}