Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-06 17:48:32 +02:00
Code Issues Packages Projects Releases Activity

Merge pull request #126 from namaless/develop

Browse Source 
Update User.php
This commit is contained in:
Andy Miller
2015-01-20 16:27:23 -07:00
parent 259d8356b0 9f782a4aed
commit 6863d70f0b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/src/Grav/Common/User/User.php
View File

@@ -4,6 +4,7 @@ namespace Grav\Common\User;
use Grav\Common\Data\Blueprints;
use Grav\Common\Data\Data;
use Grav\Common\File\CompiledYamlFile;
use Grav\Common\GravTrait;
/**
* User object
@@ -13,6 +14,8 @@ use Grav\Common\File\CompiledYamlFile;
*/
class User extends Data
{
use GravTrait;
/**
* Load user account.
*
@@ -23,10 +26,13 @@ class User extends Data
*/
public static function load($username)
{
$locator = self::$grav['locator'];
// FIXME: validate directory name
$blueprints = new Blueprints('blueprints://user');
$blueprint = $blueprints->get('account');
$file = CompiledYamlFile::instance(ACCOUNTS_DIR . $username . YAML_EXT);
$file_path = $locator->findResource('account://' . $username . YAML_EXT);
$file = CompiledYamlFile::instance($file_path);
$content = $file->content();
if (!isset($content['username'])) {
$content['username'] = $username;