--- mambo/branches/4.6/components/com_content/content.php	2006/01/26 20:11:56	194
+++ mambo/branches/4.6/components/com_content/content.php	2006/01/31 12:11:42	213
@@ -167,8 +167,9 @@
 	. "\n AND ( publish_down = '0000-00-00 00:00:00' OR publish_down >= '$now' )"
 	. "\n ORDER BY ". $order_pri . $order_sec
 	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
 
 	// Dynamic Page Title
 	$mainframe->SetPageTitle( $menu->name );
@@ -506,9 +507,10 @@
 	. "\n AND s.access<=$gid"
 	. "\n ORDER BY ". $order_pri . $order_sec
 	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
-
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
+	
 	// Dynamic Page Title
 	if ($menu) {
 		$mainframe->setPageTitle( $menu->name );
@@ -558,8 +560,9 @@
 	. "\n AND s.access <= ". $gid
 	. "\n ORDER BY ". $order_pri . $order_sec;
 	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
 
 	// Dynamic Page Title
 	$mainframe->SetPageTitle( $menu->name );
@@ -628,8 +631,9 @@
 	. "\n AND s.access <= ". $gid
 	. "\n ORDER BY ". $order_pri . $order_sec
 	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
 
 	// initiate form
  	echo '<form action="'.sefRelToAbs( 'index.php').'" method="post">';
@@ -708,8 +712,9 @@
 	. "\n AND s.access <= ". $gid
 	. "\n ORDER BY ". $order_sec
 	;
-	$database->setQuery( $query );
-	$rows = $database->loadObjectList();
+//	$database->setQuery( $query );
+//	$rows = $database->loadObjectList();
+	$rows = $database->doSQLget($query, 'mosExtendedContent');
 
 	// initiate form
  	echo '<form action="'.sefRelToAbs( 'index.php').'" method="post">';
@@ -988,7 +993,8 @@
 	. "\n AND a.access <= ". $gid
 	;
 	$database->setQuery( $query );
-	$row = NULL;
+//	$row = NULL;
+	$row = new mosExtendedContent();
 
 	if ( $database->loadObject( $row ) ) {
 		$pathway = mosPathway::getInstance();