Commit 71fb2849 authored by merlinofchaos's avatar merlinofchaos

Comment fix by John Morahan

parent fc5927b1
......@@ -553,10 +553,11 @@ class views_plugin_display extends views_object {
);
}
$items = intval($this->get_option('items_per_page'));
$options['items_per_page'] = array(
'category' => 'basic',
'title' => $this->use_pager() ? t('Items per page') : t('Items to display'),
'value' => intval($this->get_option('items_per_page')),
'value' => $items ? $items : t('Unlimited'),
'desc' => t('Change how many items to display.'),
);
......
......@@ -161,7 +161,7 @@ function views_menu_alter(&$callbacks) {
// know what placeholders they might use. Note that we
// first construct the regex itself by replacing %views_arg
// in the display path, then we use this constructed regex
// (which will be something like '#foo/%[^/]*/bar#') to
// (which will be something like '#^(foo/%[^/]*/bar)$#') to
// search through the existing paths.
$regex = '#^('. preg_replace('#%views_arg#', '%[^/]*', implode('|', array_keys($result))) .')$#';
$matches = preg_grep($regex, array_keys($callbacks));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment