Changeset 1657

Show
Ignore:
Timestamp:
03/02/10 10:24:39 (5 months ago)
Author:
klemens
Message:

Tweaked escaping

Location:
trunk/plugins/ullCorePlugin/lib/form/widget
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/plugins/ullCorePlugin/lib/form/widget/ullWidget.php

    r1656 r1657  
    77    $this->addOption('suffix'); 
    88    $this->addOption('nowrap'); 
     9     
    910    parent::__construct($options, $attributes); 
    1011  } 
    … …  
    1819     
    1920    $value = $this->handleOptions($value); 
    20  
     21     
    2122    return (string) $value; 
    2223  } 

  • trunk/plugins/ullCorePlugin/lib/form/widget/ullWidgetForeignKey.php

    r1656 r1657  
    6969      try 
    7070      { 
    71         $return .= $object->$method(); 
     71        $return .= esc_entities($object->$method()); 
    7272      } 
    7373      catch (Exception $e) 
    … …  
    7575        // This is necessary for translated columns. Why? 
    7676        $object = Doctrine::getTable($this->getOption('model'))->find($value); 
    77         $return .= $object->$method(); 
     77        $return .= esc_entities($object->$method()); 
    7878      } 
    7979       
    … …  
    8484 
    8585    } 
    86      
    87     $return = esc_entities($return); 
    8886     
    8987    // POPUP