← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/drupal5/intrepid-security

« back to all changes in this revision

Viewing changes to modules/taxonomy/taxonomy.module

  • Committer: Bazaar Package Importer
  • Author(s): Emanuele Gentili
  • Date: 2008-01-12 14:00:18 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080112140018-aef0id92a2r0611p
Tags: 5.6-1ubuntu1
https://launchpad.net/bugs/182291
* Merge from debian unstable, remaining changes (LP: #182291):
  + debian/patches/02_htaccess:
    - Add RewriteBase /drupal5
  + debian/control:
    - Replace exim4 with postfix in Depends.
    - Modify Maintainer value to match DebianMaintainerField spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/taxonomy/taxonomy.module
1
1
<?php
2
 
// $Id: taxonomy.module,v 1.330.2.14 2007/12/06 18:16:38 drumm Exp $
 
2
// $Id: taxonomy.module,v 1.330.2.15 2007/12/20 07:48:11 drumm Exp $
3
3
 
4
4
/**
5
5
 * @file
622
622
function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
623
623
  $vocabulary = taxonomy_get_vocabulary($vid);
624
624
  $help = ($help) ? $help : $vocabulary->help;
625
 
  $blank = 0;
626
625
 
627
626
  if (!$vocabulary->multiple) {
628
627
    $blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -');
629
628
  }
 
629
  else {
 
630
    $blank = ($vocabulary->required) ? 0 : t('- None -');
 
631
  }
630
632
 
631
633
  return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank);
632
634
}