From c3f74b5609b711b71f10d748b079a8e98377834f Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 12 Sep 2014 12:09:32 +0000 Subject: Addon count on addon settings page (featured) doesnt work (always 0). Commented out. --- mod/settings.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/settings.php b/mod/settings.php index d6ebf9e90..5038a63c4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -590,8 +590,9 @@ function settings_content(&$a) { $settings_addons = ""; $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' "); - if(! count($r)) - $settings_addons = t('No feature settings configured'); + // FIXME: This is always 0, even if there are plugin settings on this page + // if(! count($r)) + // $settings_addons = t('No feature settings configured'); call_hooks('feature_settings', $settings_addons); -- cgit v1.2.3 From e0047446964cc038e68df824755af8bc57359ecf Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 12 Sep 2014 14:31:02 +0000 Subject: Fixed. Thanks to Thomas. --- mod/settings.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mod') diff --git a/mod/settings.php b/mod/settings.php index 5038a63c4..a31814bf0 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -589,10 +589,9 @@ function settings_content(&$a) { if((argc() > 1) && (argv(1) === 'featured')) { $settings_addons = ""; - $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' "); - // FIXME: This is always 0, even if there are plugin settings on this page - // if(! count($r)) - // $settings_addons = t('No feature settings configured'); + $r = q("SELECT * FROM `hook` WHERE `hook` = 'feature_settings' "); + if(! count($r)) + $settings_addons = t('No feature settings configured'); call_hooks('feature_settings', $settings_addons); -- cgit v1.2.3 From e1cb4b28331f6228dd81c1ee5c7753cb5057b77a Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 12 Sep 2014 18:18:46 +0000 Subject: expert_mode > expert --- mod/webpages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/webpages.php b/mod/webpages.php index 1b906a97f..efaf3c4bf 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -46,7 +46,7 @@ function webpages_content(&$a) { // } - if(feature_enabled($owner,'expert_mode')) { + if(feature_enabled($owner,'expert')) { $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); if(! $mimetype) $mimetype = 'choose'; -- cgit v1.2.3 From bd2139d16addf42b33f5f5cf90516022273bc8b6 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 12 Sep 2014 21:04:43 +0200 Subject: do not load next page if justifiedGallery() is not ready yet --- mod/photos.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/photos.php b/mod/photos.php index f2df894c0..c11d04192 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -635,7 +635,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(60); + $a->set_pager_itemspage(5); } if($_GET['order'] === 'posted') @@ -1168,7 +1168,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(60); + $a->set_pager_itemspage(5); } $r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` -- cgit v1.2.3 From 12900129bb8b4cd83d876ff22a2848e6a89acbc8 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 12 Sep 2014 21:06:37 +0200 Subject: reset testing values back to default --- mod/photos.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/photos.php b/mod/photos.php index c11d04192..f2df894c0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -635,7 +635,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(5); + $a->set_pager_itemspage(60); } if($_GET['order'] === 'posted') @@ -1168,7 +1168,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(5); + $a->set_pager_itemspage(60); } $r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` -- cgit v1.2.3