From f4ff48f5c0d7b94e96ed5a16295c04df2943d336 Mon Sep 17 00:00:00 2001 From: maxwell Date: Mon, 22 Nov 2010 10:26:00 -0800 Subject: [PATCH] commenting out mobile for now. photos now post from only a users photos --- app/controllers/application_controller.rb | 4 ++-- app/controllers/status_messages_controller.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1fe536c89..e6ba2f67f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,10 +3,10 @@ # the COPYRIGHT file. class ApplicationController < ActionController::Base - has_mobile_fu + #has_mobile_fu protect_from_forgery :except => :receive - before_filter :mobile_except_ipad + # =>before_filter :mobile_except_ipad before_filter :set_contacts_and_status, :except => [:create, :update] before_filter :count_requests before_filter :set_invites diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index 8e8f3c8a3..54487dbeb 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -9,7 +9,7 @@ class StatusMessagesController < ApplicationController respond_to :json, :only => :show def create - photos = Photo.all(:id.in => [*params[:photos]]) + photos = Photo.all(:id.in => [*params[:photos]], :diaspora_handle => current_user.person.diaspora_handle) public_flag = params[:status_message][:public] public_flag.to_s.match(/(true)/) ? public_flag = true : public_flag = false