class.egw_framework.inc.php

ralfbecker_sf 2016-04-07 15:46:36 UTC #1

Author: ralfbecker
New Revision: 55675

URL: http://svn.stylite.de/viewvc/egroupware?rev=55675&view=rev
Log:
invalidate cached bundels, if files are not from new location in /api/js

Modified:
trunk/phpgwapi/inc/class.egw_framework.inc.php

Modified: trunk/phpgwapi/inc/class.egw_framework.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.egw_framework.inc.php?rev=55675&r1=55674&r2=55675&view=diff

— trunk/phpgwapi/inc/class.egw_framework.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_framework.inc.php Thu Apr 7 17:46:36 2016
@@ -1968,8 +1968,9 @@
unset($bundles[’.ts’]);
foreach($bundles as $name => $files)
{

  		// to facilitate move to new et2 location, can be removed after 16.1 release

  		if ($name == 'et21' && !in_array('/api/js/etemplate/etemplate2.js', $files))

  		// to facilitate move to new et2/api location, can be removed after 16.1 release

  		if ($name == 'et21' && !in_array('/api/js/etemplate/etemplate2.js', $files) ||

  			$name == 'api' && !in_array('/api/js/jquery/jquery.js', $files))
  		{
  			egw_cache::unsetTree(__CLASS__, 'bundles');
  			return self::bundle_js_includes($js_includes);

@@ -1982,6 +1983,7 @@
$file2bundle += array_combine($files, array_fill(0, count($files), $name));
}
}

  	//error_log(__METHOD__."() file2bundle=".array2string($file2bundle));
  }
  $to_include = $included_bundles = array();
  $query = null;

@@ -2028,10 +2030,7 @@
}
}
}

```
  /*_debug_array($js_includes);
```

  _debug_array(array_values($to_include));

```
  die('STOP');*/
```

  //error_log(__METHOD__."(".array2string($js_includes).') debug_minify='.array2string($GLOBALS['egw_info']['server']['debug_minify']).', include_bundels='.array2string($included_bundles).' returning '.array2string(array_values(array_unique($to_include))));
  return array_values(array_unique($to_include));

}

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