Commit bbdc5256 authored by webchick's avatar webchick

Issue #1798884 by Luukyb, alexpott: Convert path_alias_whitelist() to state system .

parent 546fcdfe
......@@ -72,7 +72,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) {
// Retrieve the path alias whitelist.
if (!isset($cache['whitelist'])) {
$cache['whitelist'] = variable_get('path_alias_whitelist', NULL);
$cache['whitelist'] = state()->get('system.path_alias_whitelist', NULL);
if (!isset($cache['whitelist'])) {
$cache['whitelist'] = drupal_path_alias_whitelist_rebuild();
}
......@@ -391,7 +391,7 @@ function drupal_path_alias_whitelist_rebuild($source = NULL) {
// When paths are inserted, only rebuild the whitelist if the system path
// has a top level component which is not already in the whitelist.
if (!empty($source)) {
$whitelist = variable_get('path_alias_whitelist', NULL);
$whitelist = state()->get('system.path_alias_whitelist', NULL);
if (isset($whitelist[strtok($source, '/')])) {
return $whitelist;
}
......@@ -404,7 +404,7 @@ function drupal_path_alias_whitelist_rebuild($source = NULL) {
foreach ($result as $row) {
$whitelist[$row->path] = TRUE;
}
variable_set('path_alias_whitelist', $whitelist);
state()->set('system.path_alias_whitelist', $whitelist);
return $whitelist;
}
......
......@@ -2163,6 +2163,18 @@ function system_update_8028() {
update_variable_del('menu_masks');
}
/**
* Convert path_alias_whitelist variable to state API.
*
* @ingroup state_upgrade
*/
function system_update_8029() {
if ($value = update_variable_get('path_alias_whitelist', FALSE)) {
state()->set('system.path_alias_whitelist', $value);
}
update_variable_del('path_alias_whitelist');
}
/**
* @} End of "defgroup updates-7.x-to-8.x".
* The next series of updates should start at 9000.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment