Merge remote branch 'friendica/master'

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

diff --git a/impressum/impressum.php b/impressum/impressum.php
index a4e7199c970c66b26237c39e713b9b9425a327c0..3c1106c9a9761cf056ae63258c871ccafbdb9cc7 100755 (executable)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -29,6 +29,7 @@ function impressum_footer($a, &$b) {
     $text = bbcode(get_config('impressum','footer_text'), true);
     if (! $text == '') {
         $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />';
+        $b .= '<div class="clear"></div>';
         $b .= '<div id="impressum_footer">'.$text.'</div>';
     }
 }
@@ -77,7 +78,7 @@ function impressum_plugin_admin_post (&$a) {
     info( t('Settings updated.'). EOL );
 }
 function impressum_plugin_admin (&$a, &$o) {
-    $t = file_get_contents( dirname(__file__). "/admin.tpl" );
+    $t = get_markup_template( "admin.tpl", "addon/impressum/" );
     $o = replace_macros($t, array(
         '$submit' => t('Submit'),
         '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')),