Browse Source

Fix admin form and coding standards.

pull/651/head
Jared Whiklo 10 years ago
parent
commit
c3970f9834
  1. 4
      includes/admin.form.inc
  2. 4
      includes/breadcrumb.inc

4
includes/admin.form.inc

@ -103,7 +103,7 @@ function islandora_repository_admin(array $form, array &$form_state) {
'#description' => t('Larger sites may experience a notable performance improvement when disabled due to how breadcrumbs are constructed.'), '#description' => t('Larger sites may experience a notable performance improvement when disabled due to how breadcrumbs are constructed.'),
'#default_value' => variable_get('islandora_render_drupal_breadcrumbs', TRUE), '#default_value' => variable_get('islandora_render_drupal_breadcrumbs', TRUE),
), ),
'islandora_breadcrumbs_backend' => array( 'islandora_breadcrumbs_backends' => array(
'#type' => 'radios', '#type' => 'radios',
'#title' => t('Breadcrumb generation'), '#title' => t('Breadcrumb generation'),
'#description' => t('How breadcrumbs for Islandora objects are generated for display.'), '#description' => t('How breadcrumbs for Islandora objects are generated for display.'),
@ -111,7 +111,7 @@ function islandora_repository_admin(array $form, array &$form_state) {
'#options' => array_map($map_to_title, $breadcrumb_backend_options), '#options' => array_map($map_to_title, $breadcrumb_backend_options),
'#states' => array( '#states' => array(
'visible' => array( 'visible' => array(
'islandora_render_drupal_breadcrumbs' => array('checked' => TRUE), ':input[name="islandora_render_drupal_breadcrumbs"]' => array('checked' => TRUE),
), ),
), ),
), ),

4
includes/breadcrumb.inc

@ -24,8 +24,7 @@
* not including the given object. For use in the function * not including the given object. For use in the function
* drupal_set_breadcrumb(). * drupal_set_breadcrumb().
*/ */
function islandora_get_breadcrumbs($object) { function islandora_get_breadcrumbs(AbstractObject $object) {
if (variable_get('islandora_render_drupal_breadcrumbs', TRUE)) { if (variable_get('islandora_render_drupal_breadcrumbs', TRUE)) {
$backend = variable_get('islandora_breadcrumbs_backends', ISLANDORA_BREADCRUMB_LEGACY_BACKEND); $backend = variable_get('islandora_breadcrumbs_backends', ISLANDORA_BREADCRUMB_LEGACY_BACKEND);
$backends = module_invoke_all('islandora_breadcrumbs_backends'); $backends = module_invoke_all('islandora_breadcrumbs_backends');
@ -38,7 +37,6 @@ function islandora_get_breadcrumbs($object) {
} }
$breadcrumbs = call_user_func($backends[$backend]['callable'], $object); $breadcrumbs = call_user_func($backends[$backend]['callable'], $object);
} }
array_pop($breadcrumbs); array_pop($breadcrumbs);
$context = 'islandora'; $context = 'islandora';
drupal_alter('islandora_breadcrumbs', $breadcrumbs, $context, $object); drupal_alter('islandora_breadcrumbs', $breadcrumbs, $context, $object);

Loading…
Cancel
Save