diff options
| -rw-r--r-- | entities/index.php | 3 | ||||
| -rw-r--r-- | views/default/navigation/pagination.php | 2 | ||||
| -rw-r--r-- | views/default/widgets/wrapper.php | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/entities/index.php b/entities/index.php index f33df9ced..00eb35677 100644 --- a/entities/index.php +++ b/entities/index.php @@ -24,6 +24,9 @@ $shell = true;
}
+ $context = get_input('context');
+ if ($context) set_context($context);
+
// Get the entity, if possible
if ($entity = get_entity($guid)) {
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php index 12bf5ec20..54fa3bdec 100644 --- a/views/default/navigation/pagination.php +++ b/views/default/navigation/pagination.php @@ -44,7 +44,7 @@ $baseurl = preg_replace('/[\&\?]'.$word.'\=[0-9]*/',"",$vars['baseurl']); //only display if there is content to paginate through or if we already have an offset - if ($count > $limit || $offset > 0){ + if (($count > $limit || $offset > 0) && get_context() != 'widget') { ?> diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php index 4fc752af9..7eda06ff2 100644 --- a/views/default/widgets/wrapper.php +++ b/views/default/widgets/wrapper.php @@ -91,7 +91,7 @@ <script type="text/javascript">
$(document).ready(function() {
- $("#widgetcontent<?php echo $vars['entity']->getGUID(); ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $vars['entity']->getGUID(); ?>?shell=no&username=<?php echo page_owner_entity()->username; ?>&context=<?php echo get_context(); ?>&callback=true");
+ $("#widgetcontent<?php echo $vars['entity']->getGUID(); ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $vars['entity']->getGUID(); ?>?shell=no&username=<?php echo page_owner_entity()->username; ?>&context=widget&callback=true");
// run function to check for widgets collapsed/expanded state
var forWidget = "widget<?php echo $vars['entity']->getGUID(); ?>";
|