Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: update packages make pageheader work on all themes * master:
This commit is contained in:
commit
8df87c556d
2 changed files with 6 additions and 3 deletions
BIN
pageheader.tgz
BIN
pageheader.tgz
Binary file not shown.
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function pageheader_install() {
|
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', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
|
||||||
register_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
|
register_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
|
||||||
|
|
||||||
|
@ -18,10 +18,13 @@ function pageheader_install() {
|
||||||
|
|
||||||
|
|
||||||
function pageheader_uninstall() {
|
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', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
|
||||||
unregister_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
|
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');
|
$words = get_config('pageheader','text');
|
||||||
if(! $words)
|
if(! $words)
|
||||||
$words = 'pageheader,';
|
$words = '';
|
||||||
|
|
||||||
$s .= '<div class="settings-block">';
|
$s .= '<div class="settings-block">';
|
||||||
$s .= '<h3>' . t('"pageheader" Settings') . '</h3>';
|
$s .= '<h3>' . t('"pageheader" Settings') . '</h3>';
|
||||||
|
|
Loading…
Reference in a new issue