Fixes #4483 fixes undefined variable errors for non-deprecated functions in engine

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 1528d97c5aed0fe2c31658c4f7f73ce0475a02c0..b65d98c95720c4ed9721a496a0538327fb27a4b5 100644 (file)
--- 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 9bf1529d613ecf25f161f6b1d71dc7d2eaa2e5a5..305aa00b6a2172662381128e748e5fe5abe65d6b 100644 (file)
--- 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 ae5df66f7671a1924e0c85205abc48134d180c95..d950261a2e1d85fd75348475d044109ad213a8de 100644 (file)
--- 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 a675d976a5cc4853412cf67241936b2ebed9e995..46c7d059e12da6ff857a52dbaf84e7e465fb5f39 100644 (file)
--- 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 e1f95ed974da7c103590766b4b3f8e6735cbf148..5ee640549f620c5f62f63521986f85f0c0f8d763 100644 (file)
--- 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(