This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!DOCTYPE html> | |
<html> | |
<head> | |
<meta http-equiv="X-UA-Compatible" content="chrome=1" /> | |
<meta http-equiv="X-UA-Compatible" content="IE=8" /> | |
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> | |
<meta name="keywords" content="intranet, company networking, yammer, enterprise, productivity, communications, TechCrunch50" /> | |
<meta name="description" content="Yammer is a tool for making companies and organizations more productive through the exchange of short frequent answers to one simple question: What are you working on?" /> | |
<meta name="verify-v1" content="BpmwYYWurIQzSkvWBGJSbTFJsMdEa7d167/GT8ScCuA=" /> | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<style type="text/css" media="screen"> | |
body { | |
padding: 10px; | |
} | |
#content { | |
width: 400px; | |
margin: 20px auto 0; | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/xp/base_controller.rb b/app/controllers/xp/base_controller.rb | |
index 1116745..2ee4eec 100644 | |
--- a/app/controllers/xp/base_controller.rb | |
+++ b/app/controllers/xp/base_controller.rb | |
@@ -6,12 +6,12 @@ class Xp::BaseController < ApplicationController | |
def current_device | |
return @current_device if defined?(@current_device) | |
- @current_device = current_user.try(:device) || Xp::Device.find_by_id( session[:device_id] || params[:id] ) | |
+ @current_device = current_user.try(:device) || Xp::Device.find_by_id( session[:device_id] || params[:device_id] ) |