/[drupal]/contributions/modules/creativecommons/creativecommons.module
ViewVC logotype

Diff of /contributions/modules/creativecommons/creativecommons.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.9.2.65, Wed Nov 4 08:51:15 2009 UTC revision 1.9.2.66, Tue Nov 10 11:29:31 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: creativecommons.module,v 1.9.2.64 2009/11/04 08:40:49 balleyne Exp $  // $Id: creativecommons.module,v 1.9.2.65 2009/11/04 08:51:15 balleyne Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 209  function creativecommons_settings() { Line 209  function creativecommons_settings() {
209      '#required' => NULL,      '#required' => NULL,
210    );    );
211    
212    // This if should only wrap the search option when other options are included here    // This if should only wrap the search option when other options are included here
213    if (module_exists('search')) {    if (module_exists('search')) {
214      $form['creativecommons_advanced'] = array(      $form['creativecommons_advanced'] = array(
215        '#type' => 'fieldset',        '#type' => 'fieldset',
# Line 222  function creativecommons_settings() { Line 222  function creativecommons_settings() {
222        '#default_value' => variable_get('creativecommons_search', TRUE),        '#default_value' => variable_get('creativecommons_search', TRUE),
223        '#description' => t('Enabled CC search options'),        '#description' => t('Enabled CC search options'),
224      );      );
225    
226    // TODO: 2.x revisit (and probably remove) this when ccREL is implemented, since RDF/XML is no longer recommended    // TODO: 2.x revisit (and probably remove) this when ccREL is implemented, since RDF/XML is no longer recommended
227    $form['creativecommons_advanced']['creativecommons_rdf'] = array(    $form['creativecommons_advanced']['creativecommons_rdf'] = array(
228      '#type' => 'checkbox',      '#type' => 'checkbox',
# Line 1668  function creativecommons_block($op='list Line 1668  function creativecommons_block($op='list
1668              $site_license_display = variable_get('creativecommons_site_license_display', FALSE);              $site_license_display = variable_get('creativecommons_site_license_display', FALSE);
1669              $site_license = creativecommons_get_site_license();              $site_license = creativecommons_get_site_license();
1670              $redundant_display = variable_get('creativecommons_node_license_redundant_display', TRUE);              $redundant_display = variable_get('creativecommons_node_license_redundant_display', TRUE);
1671              if ($site_license_display && !$redundant_display && $node->cc->uri == $site_license->uri){              if ($site_license_display && !$redundant_display && $node->cc->uri == $site_license->uri) {
1672                return;                return;
1673              }              }
1674    
1675              // license html              // license html
1676              $block['content'] = $node->cc->get_html();              $block['content'] = $node->cc->get_html();
1677              return $block;              return $block;
Legend:
Removed from v.1.9.2.65  
changed lines
  Added in v.1.9.2.66
  ViewVC Help
Powered by ViewVC 1.1.2