[Fmsystem-commits] [11155] property: images from external url

[Sigurd Nes]

Revision: 11155
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11155
Author:   sigurdne
Date:     2013-06-07 07:41:53 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
property: images from external url

Modified Paths:
--------------
    trunk/property/inc/class.uientity.inc.php

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2013-06-07 07:40:55 UTC (rev 
11154)
+++ trunk/property/inc/class.uientity.inc.php   2013-06-07 07:41:53 UTC (rev 
11155)
@@ -2009,11 +2009,11 @@
                                                $_keys[] = $_substitute;
        
                                                $__value = false;
-                                               if(!$__value = 
urlencode($values[trim($_substitute, '_')]))
+                                               if(!$__value = 
urlencode($values[str_replace(array('__','*'),array('',''), $_substitute)]))
                                                {
                                                        foreach 
($values['attributes'] as $_attribute)
                                                        {
-                                                               
if(trim($_substitute, '_') == $_attribute['name'])
+                                                               
if(str_replace(array('__','*'),array('',''), $_substitute) == 
$_attribute['name'])
                                                                {
                                                                        
$__value = urlencode($_attribute['value']);
                                                                        break;
@@ -2414,7 +2414,10 @@
                        $GLOBALS['phpgw']->js->validate_file( 'tinybox2', 
'packed', 'phpgwapi' );
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
 
+                       phpgw::import_class('phpgwapi.jquery');
+                       phpgwapi_jquery::load_widget('core');
 
+
                        $criteria = array
                                (
                                        'appname'       => 
$this->type_app[$this->type],
@@ -2424,11 +2427,6 @@
 
                        $custom_functions = 
$GLOBALS['phpgw']->custom_functions->find($criteria);
 
-                       if($custom_functions)
-                       {
-                               phpgw::import_class('phpgwapi.jquery');
-                               phpgwapi_jquery::load_widget('core');
-                       }
 
                        foreach ( $custom_functions as $entry )
                        {