X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fmodels%2Fvideos_model.php;h=711b967a0930f36f0a01b4c9d00a0a28891d7bd1;hb=a4de6b263b2faef2a215da76c93b756299201544;hp=64ee48ef888260120d09deb1c7fbed8762703f28;hpb=dc64e2577139f588736d8b2ca0e468e3dfc07ad4;p=living-lab-site.git

diff --git a/application/models/videos_model.php b/application/models/videos_model.php
index 64ee48e..711b967 100644
--- a/application/models/videos_model.php
+++ b/application/models/videos_model.php
@@ -520,8 +520,8 @@ class Videos_model extends CI_Model {
 		else
 		{
 			// TODO select data, description if details are needed
-			$selected_columns = "id, name, title, duration, user_id, views,
-					thumbs_count, default_thumb,
+			$selected_columns = "v.id, name, title, duration, user_id, views,
+					thumbs_count, default_thumb, u.username,
 					(views + likes - dislikes) AS score, 
 					$relevance";
 			$order = "ORDER BY relevance DESC, score DESC";
@@ -534,8 +534,8 @@ class Videos_model extends CI_Model {
 			$category_cond = "";
 
 		$str_query = "SELECT $selected_columns
-			FROM `videos`
-			WHERE  $category_cond ( $search_cond )
+			FROM `videos` v, `users` u
+			WHERE  v.user_id = u.id AND $category_cond ( $search_cond )
 			$order
 			$limit";
 // 		echo "<p>$str_query</p>";