commit 7ee86142666af39c418800939d4e4f4cb33ec16d Author: xjm Date: Sat Jun 21 12:13:27 2014 -0500 A few missed renames; IDE wasn't configured correctly. :P diff --git a/core/lib/Drupal/Component/Utility/SafeMarkup.php b/core/lib/Drupal/Component/Utility/SafeMarkup.php index 6c08b6c..920335f 100644 --- a/core/lib/Drupal/Component/Utility/SafeMarkup.php +++ b/core/lib/Drupal/Component/Utility/SafeMarkup.php @@ -47,7 +47,7 @@ public static function set($string, $strategy = 'html') { * @param string $string * The content to be checked. * @param string $strategy - * The escaping strategy. See SafeMarkup::create(). Defaults to 'html'. + * The escaping strategy. See SafeMarkup::set(). Defaults to 'html'. * * @return bool * TRUE if the string is secure, FALSE otherwise. @@ -89,7 +89,7 @@ public static function concat() { * @param array $array * An array of the strings to implode. * @param string $strategy - * The escaping strategy. See SafeMarkup::create(). Defaults to 'html'. + * The escaping strategy. See SafeMarkup::set(). Defaults to 'html'. * * @return \Drupal\Component\Utility\SafeMarkup|string * The imploded string, which is now also marked as safe. @@ -115,7 +115,7 @@ public static function implode($delimiter, array $array, $strategy = 'html') { * added to any safe strings already marked for the current request. * * @param array $safe_strings - * A list of safe strings as previously retrieved by SafeMarkup::get(). + * A list of safe strings as previously retrieved by SafeMarkup::getAll(). */ public static function setMultiple(array $safe_strings) { foreach ($safe_strings as $string => $strategies) { diff --git a/core/modules/node/node.install b/core/modules/node/node.install index 40333c5..dc5bd4f 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -32,7 +32,7 @@ function node_requirements($phase) { 'value' => $value, // The result of t() is safe and so is the result of l(). Preserving // safe object. - 'description' => SafeMarkup::create($description . ' ' . l(t('Rebuild permissions'), 'admin/reports/status/rebuild')), + 'description' => SafeMarkup::set($description . ' ' . l(t('Rebuild permissions'), 'admin/reports/status/rebuild')), ); } return $requirements; diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 835d27a..9ada350 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -59,7 +59,7 @@ function system_requirements($phase) { $requirements['php'] = array( 'title' => t('PHP'), // $phpversion is safe and output of l() is safe, so this value is safe. - 'value' => SafeMarkup::create(($phase == 'runtime') ? $phpversion . ' (' . l(t('more information'), 'admin/reports/status/php') . ')' : $phpversion), + 'value' => SafeMarkup::set(($phase == 'runtime') ? $phpversion . ' (' . l(t('more information'), 'admin/reports/status/php') . ')' : $phpversion), ); } else { @@ -322,7 +322,7 @@ function system_requirements($phase) { 'severity' => $severity, 'value' => $summary, // @todo Needs to preserve safe markup. - 'description' => SafeMarkup::create($description), + 'description' => SafeMarkup::set($description), ); } if ($phase != 'install') { diff --git a/core/themes/engines/twig/twig.engine b/core/themes/engines/twig/twig.engine index cbd9c5b..ae4fe33 100644 --- a/core/themes/engines/twig/twig.engine +++ b/core/themes/engines/twig/twig.engine @@ -96,7 +96,7 @@ function twig_render_template($template_file, $variables) { $output['debug_info'] .= "\n\n"; $output['debug_suffix'] .= "\n\n\n"; } - return SafeMarkup::create(implode('', $output)); + return SafeMarkup::set(implode('', $output)); } /** @@ -228,7 +228,7 @@ function twig_drupal_escape_filter(\Twig_Environment $env, $arg, $strategy = 'ht // to avoid this when its already safe for this strategy. return twig_escape_filter($env, $return, $strategy, $charset, $autoescape); } - if (!SafeMarkup::is($return)) { + if (!SafeMarkup::isSafe($return)) { return String::checkPlain($return); } return $return;