R55934 - in /branches/14.2: etemplate/inc/ importexport/inc/

[hnategh-2]

Author: hnategh
New Revision: 55934

URL: http://svn.stylite.de/viewvc/egroupware?rev=55934&view=rev
Log:
Fix typo on get_options_from_file in import/export

Modified:
branches/14.2/etemplate/inc/class.customfields_widget.inc.php
branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php

Modified: branches/14.2/etemplate/inc/class.customfields_widget.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/inc/class.customfields_widget.inc.php?rev=55934&r1=55933&r2=55934&view=diff

— branches/14.2/etemplate/inc/class.customfields_widget.inc.php (original)
+++ branches/14.2/etemplate/inc/class.customfields_widget.inc.php Fri Apr 29 12:21:10 2016
@@ -291,7 +291,7 @@
// and used as such. All unknown values will be used for selection, not passed through to the query
if (isset($field[‘values’][’@’]))
{

•   					$options['values'] = egw_customfields::_get_options_from_file($field['values']['@']);
  

•   					$options['values'] = egw_customfields::get_options_from_file($field['values']['@']);
    					unset($field['values']['@']);
    				} else {
    					$options['values'] = array_diff_key($field['values'], array_flip(ajax_select_widget::$known_options));
  

@@ -311,7 +311,7 @@
$showthis = ‘#a#l#l#’;
if (count($field[‘values’]) == 1 && isset($field[‘values’][’@’]))
{

•   					$field['values'] = egw_customfields::_get_options_from_file($field['values']['@']);
  

•   					$field['values'] = egw_customfields::get_options_from_file($field['values']['@']);
    				}
    				if($this->advanced_search && $field['rows'] <= 1) $field['values'][''] = lang('doesn\'t matter');
    				if ($readonly)
  

Modified: branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php?rev=55934&r1=55933&r2=55934&view=diff

— branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php (original)
+++ branches/14.2/importexport/inc/class.importexport_widget_filter.inc.php Fri Apr 29 12:21:10 2016
@@ -109,7 +109,7 @@
// and used as such. All unknown values will be used for selection, not passed through to the query
if (isset($field[‘values’][’@’]))
{

•   				$options['values'] = egw_customfields::_get_options_from_file($field['values']['@']);
  

•   				$options['values'] = egw_customfields::get_options_from_file($field['values']['@']);
    				unset($field['values']['@']);
    			} else {
    				$options['values'] = array_diff_key($field['values'], array_flip(ajax_select_widget::$known_options));
  

@@ -124,7 +124,7 @@
{
if (count($field[‘values’]) == 1 && isset($field[‘values’][’@’]))
{

•   					$field['values'] = egw_customfields::_get_options_from_file($field['values']['@']);
  

•   					$field['values'] = egw_customfields::get_options_from_file($field['values']['@']);
    				}
    				foreach((array)$field['values'] as $key => $val)
    				{
  

---

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs