diff --git a/app/config/version.php b/app/config/version.php index cb8e7b4942..dfcf76a60e 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.1.0-pre', - 'hash_version' => 'v2.1.0-pre-45-g51e4806', + 'hash_version' => 'v2.1.0-pre-47-g39f40a3', ); \ No newline at end of file diff --git a/app/controllers/account/ProfileController.php b/app/controllers/account/ProfileController.php index 6dc1c4b5e0..adb4a2c250 100755 --- a/app/controllers/account/ProfileController.php +++ b/app/controllers/account/ProfileController.php @@ -20,12 +20,7 @@ class ProfileController extends AuthorizedController { // Get the user information $user = Sentry::getUser(); - - // Show the page - - $location_list = array('' => 'Select One') + Location::lists('name', 'id'); - - // Show the page + $location_list = locationsList(); return View::make('frontend/account/profile', compact('user'))->with('location_list',$location_list); } @@ -63,7 +58,7 @@ class ProfileController extends AuthorizedController $user->website = Input::get('website'); $user->location_id = Input::get('location_id'); $user->gravatar = Input::get('gravatar'); - + if (Input::file('avatar')) { $image = Input::file('avatar'); $file_name = $user->first_name."-".$user->last_name.".".$image->getClientOriginalExtension(); @@ -75,7 +70,7 @@ class ProfileController extends AuthorizedController if (Input::get('avatar_delete') == 1 && Input::file('avatar') == "") { $user->avatar = NULL; } - + $user->save(); // Redirect to the settings page