Merge remote-tracking branch 'upstream/master'

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

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
old mode 100644 (file)
new mode 100755 (executable)
index d9b187d..947926c
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -10,7 +10,7 @@
  */
 
 function pageheader_install() {
-    register_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
+    register_hook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
        register_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
        register_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
 
@@ -18,10 +18,13 @@ function pageheader_install() {
 
 
 function pageheader_uninstall() {
-    unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
+    unregister_hook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
        unregister_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
        unregister_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
 
+       // hook moved, uninstall the old one if still there. 
+    unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
+
 }
 
 
@@ -41,7 +44,7 @@ function pageheader_addon_settings(&$a,&$s) {
 
        $words = get_config('pageheader','text');
        if(! $words)
-               $words = 'pageheader,';
+               $words = '';
 
     $s .= '<div class="settings-block">';
     $s .= '<h3>' . t('"pageheader" Settings') . '</h3>';
@@ -49,7 +52,7 @@ function pageheader_addon_settings(&$a,&$s) {
     $s .= '<input id="pageheader-words" type="text" size="80" name="pageheader-words" value="' . $words .'" />';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
        return;