From 0ac3aa92df97ea7fd06bdcbb744b6c910cdb09ed Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Mon, 18 Jun 2012 07:20:54 -0400
Subject: Fixes #4483 fixes undefined variable errors for non-deprecated
 functions in engine

---
 engine/lib/admin.php         | 2 +-
 engine/lib/configuration.php | 4 +++-
 engine/lib/entities.php      | 2 +-
 engine/lib/pagehandler.php   | 2 +-
 engine/lib/statistics.php    | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 1528d97c5..b65d98c95 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -572,7 +572,7 @@ function admin_markdown_page_handler($pages) {
 	if (!$plugin) {
 		$error = elgg_echo('admin:plugins:markdown:unknown_plugin');
 		$body = elgg_view_layout('admin', array('content' => $error, 'title' => $error));
-		echo elgg_view_page($title, $body, 'admin');
+		echo elgg_view_page($error, $body, 'admin');
 		return true;
 	}
 
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 9bf1529d6..305aa00b6 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -476,10 +476,12 @@ function get_config($name, $site_guid = 0) {
 			break;
 	}
 
+	// @todo these haven't really been implemented in Elgg 1.8. Complete in 1.9.
 	// show dep message
 	if ($new_name) {
+	//	$msg = "Config value $name has been renamed as $new_name";
 		$name = $new_name;
-		elgg_deprecated_notice($msg, $dep_version);
+	//	elgg_deprecated_notice($msg, $dep_version);
 	}
 
 	// decide from where to return the value
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index ae5df66f7..d950261a2 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1774,7 +1774,7 @@ function import_entity_plugin_hook($hook, $entity_type, $returnvalue, $params) {
 		if ($tmp) {
 			// Make sure its saved
 			if (!$tmp->save()) {
-				elgg_echo('ImportException:ProblemSaving', array($element->getAttribute('uuid')));
+				$msg = elgg_echo('ImportException:ProblemSaving', array($element->getAttribute('uuid')));
 				throw new ImportException($msg);
 			}
 
diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index a675d976a..46c7d059e 100644
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -129,7 +129,7 @@ function elgg_error_page_handler($hook, $type, $result, $params) {
 		$content = elgg_view("errors/default", $params);
 	}
 	$body = elgg_view_layout('error', array('content' => $content));
-	echo elgg_view_page($title, $body, 'error');
+	echo elgg_view_page('', $body, 'error');
 	exit;
 }
 
diff --git a/engine/lib/statistics.php b/engine/lib/statistics.php
index e1f95ed97..5ee640549 100644
--- a/engine/lib/statistics.php
+++ b/engine/lib/statistics.php
@@ -95,8 +95,8 @@ function get_number_users($show_deactivated = false) {
  * @return string
   */
 function get_online_users() {
-	$count = find_active_users(600, 10, $offset, true);
-	$objects = find_active_users(600, 10, $offset);
+	$count = find_active_users(600, 10, 0, true);
+	$objects = find_active_users(600, 10);
 
 	if ($objects) {
 		return elgg_view_entity_list($objects, array(
-- 
cgit v1.2.3