From c1935f6eabafc1e6b32916b544883d513a82f48b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 1 Apr 2012 22:27:10 -0700
Subject: [PATCH] make pageheader work on all themes

---
 pageheader.tgz            | Bin 1194 -> 1198 bytes
 pageheader/pageheader.php |   9 ++++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pageheader.tgz b/pageheader.tgz
index 876d37e400b36711ff92d02129d9aebdc5983817..a253238de444fb6b268dbb8010139605016dbfed 100755
GIT binary patch
literal 1198
zcmV;f1X24RiwFQ0IC)P11MOFBZ`(Ey_E+myTs5z9idd5011I)SASpKNrNL6{OIsMU
zL|a58N)V}}*^vLfBPH8P9M{<vCqSnMNMKVB@BPlFge+)4iBD6fwlBDdVZUGN^n1fj
zr&n|PgU+DW*5?Ik?e?%c=ybdNp<8p?T^H%l-<w4xWI~b@pcWBt!O|<nxA2lhf6zWU
zI(iP9o)O79|Lc#oC&Ux#(D@&3&wtPDsr<J)Zhwenfcfta`n?*sPiVtd{Ll0M-8$>7
zkj!WZe;M_87!x^ykj~|?QNL!s3`Wp(-Q){?jYzs+yd~pg1Z{nEYZzrQ*Kz8LO))#~
ziEI`zsV?53_6w@LrXmLrl75jb60!v!fk(Nd>C#$M;C_EkXGaUF&tooIg8fPHq_E<p
zbMTUQxc`$Nc|sjK`oGs3_SW-%Fx34&99I4R960#_b8Q%g^X82KZ{Rl)VPl+QCBTom
z6x87<6<*2`$zp7@pSYl@6hJ`L3j{0HA2b!3(Y9Un{cR?LI32;ylwm`@qbX+;P68>D
zk>ku$M!C-}i5=0N&7_m0@tlR!xm4_lx{rU3Vazk`DaEj^&MD)VvoLHP6muY@3nsAp
zr$HQFHZ8@Rdf4VT5~kSt)*)EL_hasCEp|mIDVS5~1=ayhi~FL(4Cl#IP$?N-h<`3w
zv)A``tC%LSkpERrE(DdSIr?BoGk!m)8Q)`AH-+yZu)CD(A+%efd-qE7b%PwfZU_}=
z!>F@)^A#{L6--iOMvONP4vae1h0Icpf>kyg>?hxcI7>mun~;itQVB8!8PL2DMGV&z
zJi;L&mo#S<3L!-IfisWlmQwN>q%~33K3ai{LS?4)8SF7wCn4jP*iqrwTq`p1xArEX
zV^jU&I=CE~5TtZIHZ8EVs0EeN84)x~RRP&xIbVw@3Q!j<6C&y}GB&a9OmHUZ(EOBs
z;^wgmOe0?;#-OBQ;mz5iSxSU;Xeo1as&x!=z6#yyreziJYlz%CpIw0$5+TsNB08;E
z7<-rI1gT|a(AD<Hre&^mnsBkIFy+CCqiDw)Dwsbm-D+K@BuVi0eJbNgCO62+cC!?4
z6V$pgHji8rIL_yX*jFUXXpxWHdE3$<y{phc<0j=Gcp)WdSN`BJ!OEAkl}9isoXE}1
zpPKhwS{`p$zkKkpmOE}?A};i49(m<l;m*qTb<5m7rVn-N7R@-*&A7W46{9gde}D1e
zqqX6O^;t=&*Tq-s^-!iPY6|?HOeMi_@PIs>LKJtPio4GEJZ`E0ls4dH9fBZN)VFm|
z&ffo`__y2K*Ymeo^7r3Nf-QqU%Tn0aKqw0H5z|01^MQcFU};ukIS%rt(8PmR>LjPs
z8?%j?FSWh4M771Thpcbqy`hwl-_PEj{(80t9lPHDJNWtT`+s-Xt=|8i1?5%Wco(as
zA-%%+qKBV=n1?sEamqvzk{h-3t0u!P6++#cEB*~`SP>A;V;ng&!tGF4#s^$WmMkVf
zznoJa7}pDn77oPo@QMT?SDVTqoa-HJbzpxJO;({og$flaRH#s)LWK$yDpaUYp~4H{
MZvwA$r~oJc05bDZ8~^|S

literal 1194
zcmV;b1XcSViwFR^uU=081MOE^Z{kK2<`w^nvo2ke6<~8QL?lqHl&o6yvQe|@%kByd
z_JBvR$ChVEHm&mCduD9Fgs`M-NTjVlDG`jnbH6Z7$eae0_%yXEhk}C`xNfE6_6D6!
zuj07<PQTaI=Q%3v_Mp>u-CnobuQ=_l)9+NkJ(x!YEQBN}KqVsHoTb-{@8BhKx8FWK
zK7J0Lo)O8q{_Bq|PlzY9q3b``UH_ibQ}u6m9Cy$jbg}+!-|bbvc|sp{;(uQM@77gs
zhGa@Z_{*ry!kEY*gmflPjOq>ZWiW)U<0N13YedpH<4qYSLul)xJHsfdxrtL>Y^&KT
zCl=F)NhP>Jb#rQKO+^kMB>f_rBxG|w1dnn_)1|j)!1?~3&5l-7oyA->1^biYN$$l<
z*We}b@cbu1@`N__%zv+k&o=kJ+aC<d`F{?a{(!YM48wl&#(+2Q8;Ni*F0d2eN8JkQ
z@QeyCWr<`l4%$y#&{PT_p!x-Z73&Y03e9M@9QFO}LI!a<gr6zHfqX|(&M2G)QYJ&&
zo~4X(pIwnwM0+hJ?Iew7ETs08Vvm(P{@I2xTX0VqhIMyN7{{80Vf`rI11X&|fzv+;
z;`pj=Ddr@jS`Dy>@5kKU+2@K<&^@El3#=nt6!*1;3tS}=L8WATF8;Y@&0fpzH!(?K
zA^)qLObHrOEA+u^F8KX?F8E<Gx~=yBIo)UE09oCU*iDi8>l$git_hW7!>F=Z{S`1V
z5lm8KMvT{wj*Kd{gj}Q?6{|wnI7Pk>@gfBwZ$l~qN+rk`WI(g=6EWOS@Cb*9T+xh~
z8-x(U2hKdI2TAFxk>*&5eY64@h00CqGqgrvora8G;T(k{b8X1PU)bA(j!gACYvYyB
zgdnA}k!e9otC~|enG!)4sp_2;SoYU)iVBpVWkN)KMn)#KoC)?=9h#rgPux6FiK%7R
zhY=|4Ud(4~UN02FYFNr0U22`fjIUC+k}S|0R-Ve5$O84*HFzNr0wc{6)trX0cV&)|
zT4V-Y?V7Ax=31W#m#bz|!JOKPcCuxH`J;kV^Cl%pg3|Y?j3*1ZMOI;$h1{E<?kgkn
z*fD|Qf_{j7O~M7uOOxfHW$Em08nn^5aWM&AND2CtJ$OvAvRm3JA{ggEWbS59&HEuO
zkGH&EK6u#5Mp#&gOMRMUUImwjv+{jCJ$H{8Nj=5+Tu${|?jK9Vs7)^3Uw-&#ZN*`I
zR$8i6@zvIC$dpBOf&Y_<B)AzK(5Fj?>W);OR~ethb(Mg^6?oZ)AjmcKTRJJ{?|)JJ
zyItYyRa`H``)`)Qj-8-&DI97y<c;}=#h{qkZos{;bW4j`*77OT@!*v@$tcy@bgSnJ
zW3N3?W3ike>l=A-DAeQk^S5Weo*%%*zW4tQe%^fl?+&`<`~S0`c-1%F#p?QyUgLVv
zyH7yO!`qf|#zYd5TXpGIGloMdgp!*n{w?0MA|RZ{xN&HN@8QBSKHvpq$zlTZ%Q^Ld
zaeZ~s%7J(uibx=Gb!Tb7g}$w=4qD&BjFl)+qC|-jB}$YiQKCeN5+zEMDDhJG8#QP-
IsQ@Sd0Kqz1X8-^I

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index d9b187de3..cf92204a5 100755
--- 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>';