Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Issue #1089040 by Remon, mlncn: Added Cache rdf_get_namespaces() using drupal_static(). Don't add caches unless there's a demonstrated performance degradation." 

This reverts commit 8d1534410d.
8.0.x
webchick 2012-03-13 09:13:18 -07:00
parent 0549db82c6
commit 211ff3f2f1
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/modules/rdf/rdf.module
View File

@ -95,26 +95,23 @@ function rdf_rdf_namespaces() {
* hook_rdf_namespaces().
*/
function rdf_get_namespaces() {
$rdf_namespaces = &drupal_static(__FUNCTION__);
if (!isset($rdf_namespaces)) {
$rdf_namespaces = module_invoke_all('rdf_namespaces');
// module_invoke_all() uses array_merge_recursive() which might return
// nested arrays if several modules redefine the same prefix multiple
// times. We need to ensure the array of namespaces is flat and only
// contains strings as URIs.
foreach ($rdf_namespaces as $prefix => $uri) {
if (is_array($uri)) {
if (count(array_unique($uri)) == 1) {
// All namespaces declared for this prefix are the same, merge them
// all into a single namespace.
$rdf_namespaces[$prefix] = $uri[0];
}
else {
// There are conflicting namespaces for this prefix, do not include
// duplicates in order to avoid asserting any inaccurate RDF
// statements.
unset($rdf_namespaces[$prefix]);
}
$rdf_namespaces = module_invoke_all('rdf_namespaces');
// module_invoke_all() uses array_merge_recursive() which might return nested
// arrays if several modules redefine the same prefix multiple times. We need
// to ensure the array of namespaces is flat and only contains strings as
// URIs.
foreach ($rdf_namespaces as $prefix => $uri) {
if (is_array($uri)) {
if (count(array_unique($uri)) == 1) {
// All namespaces declared for this prefix are the same, merge them all
// into a single namespace.
$rdf_namespaces[$prefix] = $uri[0];
}
else {
// There are conflicting namespaces for this prefix, do not include
// duplicates in order to avoid asserting any inaccurate RDF
// statements.
unset($rdf_namespaces[$prefix]);
}
}
}