From fdd81de3de71d5bb4d7357ee9b36e78de321e7ac Mon Sep 17 00:00:00 2001
From: "tim.plunkett" <tim.plunkett@241634.no-reply.drupal.org>
Date: Mon, 27 Aug 2012 11:39:34 +0200
Subject: [PATCH] Issue #1757836 by tim.plunkett | aspilicious: Fixed Core
updated some variables/config thingies again.
---
lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php | 2 +-
lib/Views/comment/Plugin/views/argument/UserUid.php | 2 +-
lib/Views/user/Plugin/views/argument/Uid.php | 2 +-
lib/Views/user/Plugin/views/argument_validator/User.php | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
index 6c7282cef847..9fa3bc40707f 100644
--- a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
+++ b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
@@ -45,7 +45,7 @@ function testUserName() {
$this->assertIdentical($render, $username, 'If the user is not linked the username should be printed out for a normal user.');
$view->result[0]->uid = 0;
- $anon_name = variable_get('anonymous', t('Anonymous'));
+ $anon_name = config('user.settings')->get('anonymous');
$view->result[0]->users_name = '';
$render = $view->field['name']->advanced_render($view->result[0]);
$this->assertIdentical($render, $anon_name , 'For user0 it should use the default anonymous name by default.');
diff --git a/lib/Views/comment/Plugin/views/argument/UserUid.php b/lib/Views/comment/Plugin/views/argument/UserUid.php
index bfd267311d8f..abb44b596a1b 100644
--- a/lib/Views/comment/Plugin/views/argument/UserUid.php
+++ b/lib/Views/comment/Plugin/views/argument/UserUid.php
@@ -25,7 +25,7 @@ class UserUid extends ArgumentPluginBase {
function title() {
if (!$this->argument) {
- $title = variable_get('anonymous', t('Anonymous'));
+ $title = config('user.settings')->get('anonymous');
}
else {
$title = db_query('SELECT u.name FROM {users} u WHERE u.uid = :uid', array(':uid' => $this->argument))->fetchField();
diff --git a/lib/Views/user/Plugin/views/argument/Uid.php b/lib/Views/user/Plugin/views/argument/Uid.php
index e3e86dc25f53..655bc9363e12 100644
--- a/lib/Views/user/Plugin/views/argument/Uid.php
+++ b/lib/Views/user/Plugin/views/argument/Uid.php
@@ -30,7 +30,7 @@ class Uid extends Numeric {
*/
function title_query() {
if (!$this->argument) {
- return array(variable_get('anonymous', t('Anonymous')));
+ return array(config('user.settings')->get('anonymous'));
}
$titles = array();
diff --git a/lib/Views/user/Plugin/views/argument_validator/User.php b/lib/Views/user/Plugin/views/argument_validator/User.php
index 7704896cb41e..5f0df2b94b39 100644
--- a/lib/Views/user/Plugin/views/argument_validator/User.php
+++ b/lib/Views/user/Plugin/views/argument_validator/User.php
@@ -90,7 +90,7 @@ function validate_argument($argument) {
}
else {
if ($type == 'name' || $type == 'either') {
- $name = !empty($GLOBALS['user']->name) ? $GLOBALS['user']->name : variable_get('anonymous', t('Anonymous'));
+ $name = !empty($GLOBALS['user']->name) ? $GLOBALS['user']->name : config('user.settings')->get('anonymous');
if ($argument == $name) {
$account = clone $GLOBALS['user'];
}
--
GitLab