Merge pull request #89 from fermionic/20121225-simplify-smarty-includes

[friendica-addons.git] / openstreetmap / openstreetmap.php

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index bf6632539e05eede6e3f01bc44c36d684c18347a..cb9abcd7df691117f281210dbbdf782b5582ea00 100755 (executable)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -58,7 +58,6 @@ function openstreetmap_location($a, &$item) {
 
 
 function openstreetmap_plugin_admin (&$a, &$o) {
-#      $t = file_get_contents( dirname(__file__)."/admin.tpl");
        $t = get_markup_template( "admin.tpl", "addon/openstreetmap/" );
        $tmsserver = get_config('openstreetmap','tmsserver');
        if(! $tmsserver)
@@ -67,12 +66,7 @@ function openstreetmap_plugin_admin (&$a, &$o) {
        if(! $zoom)
                $zoom = 17;
 
-       $includes = array(
-               '$field_input' => 'field_input.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o = replace_macros( $t, $includes + array(
+       $o = replace_macros( $t, array(
                '$submit' => t('Submit'),
                '$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')),
                '$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')),