Removed deprecated function uses.

4 files changed, 14 insertions, 25 deletions

diff --git a/actions/reset.php b/actions/reset.php
deleted file mode 100644
index af6967f37..000000000
--- a/actions/reset.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php

-		

-$result = reorder_widgets_from_panel(null, null, null, 'custom_index_widgets', 2);

-if ($result) {

-	system_message(elgg_echo('widgets:save:success'));

-} else {

-	register_error(elgg_echo('widgets:save:failure'));

-}

-forward(REFERER);

diff --git a/languages/en.php b/languages/en.php
index 9a930da9a..ba9cb4859 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -49,7 +49,6 @@
 		'custom_index_widgets:admin:notfound' => 'Page not found',

 		'custom_index_widgets:index' => "Index widgetisation",

 		'custom_index_widgets:num_items' => "Number of items",

-		'custom_index_widgets:reset' => "Reset all zones",

 		

 		'custom_index_widgets:pleaselogin' => "Please, please, login to see more...",

 		

@@ -61,22 +60,22 @@
 		'custom_index_widgets:login_style'=>"Login position",

 		'custom_index_widgets:inlayout'=>"In layout",

 		'custom_index_widgets:topbar'=>"Top bar",

-		'custom_index_widgets:widget_all_groups' => "All groups",
+		'custom_index_widgets:widget_all_groups' => "All groups",

 		

-		"custom_index_widgets:showdashboard"=>"End index with dashboard",
+		"custom_index_widgets:showdashboard"=>"End index with dashboard",

 		"custom_index_widgets:showdashboard_yes"=>"Yes",

-		"custom_index_widgets:showdashboard_no"=>"No",
-		"custom_index_widgets:guest_only" => "Guest only",
+		"custom_index_widgets:showdashboard_no"=>"No",

+		"custom_index_widgets:guest_only" => "Guest only",

 		"custom_index_widgets:box_style" => "Box Style",

 		"custom_index_widgets:social_share_index" => "Social Share",

 		"custom_index_widgets:login_index"=>"Login",

 		"admin:appearance:custom_index_widgets" => "Index Widgets",

-		// time limit
-		"custom_index_widgets:widget_created_time_limit" => "Time lapse",
-		"custom_index_widgets:time_limit:all" => "All time",
-		"custom_index_widgets:time_limit:day" => "Last day",
-		"custom_index_widgets:time_limit:week" => "Last week",
-		"custom_index_widgets:time_limit:month" => "Last month"
+		// time limit

+		"custom_index_widgets:widget_created_time_limit" => "Time lapse",

+		"custom_index_widgets:time_limit:all" => "All time",

+		"custom_index_widgets:time_limit:day" => "Last day",

+		"custom_index_widgets:time_limit:week" => "Last week",

+		"custom_index_widgets:time_limit:month" => "Last month"

 	

 	);

 					

diff --git a/start.php b/start.php
index 0bbc1d5c6..70a755dc2 100644
--- a/start.php
+++ b/start.php
@@ -11,12 +11,12 @@ function custom_index_widgets_init() {
 	

 	$ciw_layout = elgg_get_plugin_setting("ciw_layout", "custom_index_widgets");

 	if ($ciw_layout == NULL) {

-		set_plugin_setting("ciw_layout", "index_2rmsb", "custom_index_widgets");

+		elgg_set_plugin_setting("ciw_layout", "index_2rmsb", "custom_index_widgets");

 	}

 		 

 	$ciw_showdashboard = elgg_get_plugin_setting("ciw_showdashboard", "custom_index_widgets");

 	if ($ciw_showdashboard == NULL) {

-		set_plugin_setting("ciw_showdashboard", "yes", "custom_index_widgets");

+		elgg_set_plugin_setting("ciw_showdashboard", "yes", "custom_index_widgets");

 	}

 	elgg_register_widget_type('latest_members_index', elgg_echo('custom_index_widgets:latest_members_index'), elgg_echo('custom_index_widgets:latest_members_index'), "custom_index_widgets", true);

 	elgg_register_widget_type('inline_content_index', elgg_echo('custom_index_widgets:inline_content_index'), elgg_echo('custom_index_widgets:inline_content_index'), "custom_index_widgets", true);

@@ -68,7 +68,6 @@ function custom_index_widgets_init() {
 	

 	elgg_register_plugin_hook_handler('index', 'system', 'custom_index_widgets');

 	elgg_register_page_handler ('custom_index_widgets', 'custom_index_widgets_page_handler'); 

-	elgg_register_action('custom_index_widgets/reset', elgg_get_plugins_path() . 'custom_index_widgets/actions/reset.php', 'admin');

 

 }

 

diff --git a/views/default/widgets/latest_album_index/content.php b/views/default/widgets/latest_album_index/content.php
index f57baee9d..c511a775a 100644
--- a/views/default/widgets/latest_album_index/content.php
+++ b/views/default/widgets/latest_album_index/content.php
@@ -32,10 +32,10 @@
 ?>
 		<div class="tidypics_album_widget_single_item">
 			<div class="tidypics_album_widget_title"><a href="<?php echo $album->getURL();?>"><?php echo $album->title;?></a></div>
-			<div class="tidypics_album_widget_timestamp"> <?php echo elgg_echo("album:created:on") . ' ' . friendly_time($album->time_created);?></div>
+			<div class="tidypics_album_widget_timestamp"> <?php echo elgg_echo("album:created:on") . ' ' . elgg_get_friendly_time($album->time_created);?></div>
 <?php
 			//get the number of comments
-			$numcomments = elgg_count_comments($album);
+			$numcomments = $album->countComments();
 			if ($numcomments)
 				echo "<a href=\"{$album->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a><br>";
 ?>