Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Sidebar bugfix for dynamic pages.

  • Loading branch information...
commit 6247a0a9eba8a7b7ea7952c9d8ec4f93c0edca89 1 parent eb1632d
rWatcher authored talmdal committed
4 modules/exif_gps/controllers/exif_gps.php
View
@@ -19,7 +19,7 @@
*/
class EXIF_GPS_Controller extends Controller {
public function map($map_type, $type_id) {
- // Map all items in the specified album.
+ // Map all items in the specified album or user.
$map_title = "";
if ($map_type == "album") {
@@ -48,7 +48,7 @@ public function map($map_type, $type_id) {
}
// Make a new page.
- $template = new Theme_View("page.html", "other", "TagsMap");
+ $template = new Theme_View("page.html", "other", "EXIFMap");
$template->page_title = t("Gallery :: Map");
$template->content = new View("exif_gps_map.html");
if ($map_title == "") {
2  modules/exif_gps/helpers/exif_gps_block.php
View
@@ -124,7 +124,7 @@ static function get($block_id, $theme) {
}
$block->content->latitude = $latitude;
$block->content->longitude = $longitude;
- } elseif ($theme->item->is_album() && (module::get_var("exif_gps", "sidebar_mapformat") == 1)) {
+ } elseif (($theme->item()) && ($theme->item->is_album() && (module::get_var("exif_gps", "sidebar_mapformat") == 1))) {
// If coordinates were NOT found, and this is an album with a dynamic map, then map the contents of the album.
$items = ORM::factory("item", $theme->item->id)
->join("exif_coordinates", "items.id", "exif_coordinates.item_id")
Please sign in to comment.
Something went wrong with that request. Please try again.