From 4fe98e39b7742b03228b1df716add590e5e49df6 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Fri, 22 Jun 2012 13:15:14 -0400 Subject: [PATCH] Attempt at fixing "sidebar crashes with php5 5.4.4-rc1" forum report (comment #393361). --- 3.0/modules/exif_gps/helpers/exif_gps_block.php | 5 ++++- 3.0/modules/exif_gps/views/exif_gps_maps_sidebar.html.php | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/3.0/modules/exif_gps/helpers/exif_gps_block.php b/3.0/modules/exif_gps/helpers/exif_gps_block.php index 12a7f1bd..6d03223a 100644 --- a/3.0/modules/exif_gps/helpers/exif_gps_block.php +++ b/3.0/modules/exif_gps/helpers/exif_gps_block.php @@ -37,6 +37,7 @@ class exif_gps_block_Core { // a map of the current user. if ($theme->item()) { $album_id = ""; + $user_name = ""; $item = $theme->item; if ($item->is_album()) { $album_id = $item->id; @@ -44,7 +45,9 @@ class exif_gps_block_Core { $album_id = $item->parent_id; } $curr_user = ORM::factory("user")->where("id", "=", $item->owner_id)->find_all(); - $user_name = $curr_user[0]->full_name; + if (count($curr_user) > 0) { + $user_name = $curr_user[0]->full_name; + } // Make sure there are actually map-able items to display. $album_items_count = ORM::factory("item", $album_id) diff --git a/3.0/modules/exif_gps/views/exif_gps_maps_sidebar.html.php b/3.0/modules/exif_gps/views/exif_gps_maps_sidebar.html.php index 495554ac..7425bf45 100644 --- a/3.0/modules/exif_gps/views/exif_gps_maps_sidebar.html.php +++ b/3.0/modules/exif_gps/views/exif_gps_maps_sidebar.html.php @@ -1,9 +1,9 @@