From 1db604a22672b06fd95e60328a16d5045ca9465c Mon Sep 17 00:00:00 2001 From: Pete Harris Date: Mon, 29 Mar 2010 14:05:02 +0000 Subject: Updated VideoList deprecated functions, and removed namespace clash in error messages. --- index.php | 3 +-- start.php | 4 ++-- views/default/forms/add.php | 2 +- views/default/forms/labels/googlevideos.php | 2 +- views/default/forms/labels/metacafe.php | 2 +- views/default/forms/labels/vimeo.php | 2 +- views/default/forms/labels/youtube.php | 2 +- views/default/videolist/css.php | 2 +- world.php | 4 +--- 9 files changed, 10 insertions(+), 13 deletions(-) diff --git a/index.php b/index.php index bbeae7cf4..c1c1dc01a 100644 --- a/index.php +++ b/index.php @@ -30,8 +30,7 @@ $title = sprintf(elgg_echo("videolist:home"), "$owner->name"); // Get objects $area2 = elgg_view_title($title); -//set_input('search_viewtype', 'gallery'); -$area2 .= list_entities("object","videolist", page_owner(), 10); +$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'videolist', 'container_guids' => page_owner(), 'limit' => 10)); //$area2 .= elgg_view("staticvideo/index"); diff --git a/start.php b/start.php index 0b15243d1..e03720309 100644 --- a/start.php +++ b/start.php @@ -16,7 +16,7 @@ function videolist_init() { } // Extend system CSS with our own styles - extend_view('css','videolist/css'); + elgg_extend_view('css','videolist/css'); // Load the language file - default is english register_translations($CONFIG->pluginspath . "videolist/languages/"); @@ -25,7 +25,7 @@ function videolist_init() { register_page_handler('videolist','videolist_page_handler'); //extend this plugin for groups - extend_view('groups/left_column','videolist/groupprofile_videolist'); + elgg_extend_view('groups/left_column','videolist/groupprofile_videolist'); // Add a new videolist widget add_widget_type('videolist_view',elgg_echo("videolist:widget"),elgg_echo("videolist:widget:description"), 'profile'); diff --git a/views/default/forms/add.php b/views/default/forms/add.php index f6d5ed4c2..2da5353b7 100644 --- a/views/default/forms/add.php +++ b/views/default/forms/add.php @@ -138,7 +138,7 @@ $body .= elgg_view('input/hidden',array('internalname'=>'guid', 'value'=>$vars[' $body .= '

'.$error_msg['no-video'].'
'; + $body .= '
'.$error_msg['no-video'].'
'; } $body .= '

'; diff --git a/views/default/forms/labels/googlevideos.php b/views/default/forms/labels/googlevideos.php index 41893cea2..1d4223232 100644 --- a/views/default/forms/labels/googlevideos.php +++ b/views/default/forms/labels/googlevideos.php @@ -19,7 +19,7 @@ $body .= ""; $body .= "
"; $body .= "   "; if($error['no-search'] == 0) { - $body .= '
'.$error_msg['no-search'].'
'; + $body .= '
'.$error_msg['no-search'].'
'; } $body .= "
"; //$body .= "
"; diff --git a/views/default/forms/labels/metacafe.php b/views/default/forms/labels/metacafe.php index 08edbcfdd..76dabeb25 100644 --- a/views/default/forms/labels/metacafe.php +++ b/views/default/forms/labels/metacafe.php @@ -19,7 +19,7 @@ $body .= "
"; $body .= "
"; $body .= "   "; if($error['no-search'] == 0) { - $body .= '
'.$error_msg['no-search'].'
'; + $body .= '
'.$error_msg['no-search'].'
'; } $body .= "
"; //$body .= "
"; diff --git a/views/default/forms/labels/vimeo.php b/views/default/forms/labels/vimeo.php index 38ffc17f0..b890febb7 100644 --- a/views/default/forms/labels/vimeo.php +++ b/views/default/forms/labels/vimeo.php @@ -19,7 +19,7 @@ $body .= "
"; $body .= "
"; $body .= "   "; if ($error['no-search'] == 0) { - $body .= '
'.$error_msg['no-search'].'
'; + $body .= '
'.$error_msg['no-search'].'
'; } $body .= "
"; //$body .= "
"; diff --git a/views/default/forms/labels/youtube.php b/views/default/forms/labels/youtube.php index 37575c0f1..1b557522b 100644 --- a/views/default/forms/labels/youtube.php +++ b/views/default/forms/labels/youtube.php @@ -19,7 +19,7 @@ $body .= "
"; $body .= "
"; $body .= "   "; if($error['no-search'] == 0) { - $body .= '
'.$error_msg['no-search'].'
'; + $body .= '
'.$error_msg['no-search'].'
'; } $body .= "
"; //$body .= "
"; diff --git a/views/default/videolist/css.php b/views/default/videolist/css.php index 647def873..e2b9250b3 100644 --- a/views/default/videolist/css.php +++ b/views/default/videolist/css.php @@ -10,7 +10,7 @@ */ ?> -.error{ +.videolist_error{ color:red; font-weight:bold; font-size:11px; diff --git a/world.php b/world.php index 3fbd46ddd..263702f61 100644 --- a/world.php +++ b/world.php @@ -26,9 +26,7 @@ $title = sprintf(elgg_echo("videolist:search")); // Get objects $area2 = elgg_view_title($title); set_input('show_viewtype', 'all'); -$area2 .= list_entities("object","videolist", 0, 10, $fullview=true, $viewtypetoggle=false,$pagination=true); - -//$area2 .= elgg_view("staticvideo/index"); +$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'videolist', 'container_guids' => page_owner(), 'limit' => 10, 'full_view' => TRUE, 'view_type_toggle' => FALSE, 'pagination' => TRUE)); set_context('videolist'); $body = elgg_view_layout('one_column_with_sidebar',$area1. $area2); -- cgit v1.2.3