From owner-svn-src-user@FreeBSD.ORG  Wed Apr 16 21:57:54 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BBC6629C;
 Wed, 16 Apr 2014 21:57:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8EDB41629;
 Wed, 16 Apr 2014 21:57:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3GLvspN059453;
 Wed, 16 Apr 2014 21:57:54 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3GLvs3t059450;
 Wed, 16 Apr 2014 21:57:54 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201404162157.s3GLvs3t059450@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 16 Apr 2014 21:57:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r264568 - in user/des/fbp/lib: FBP/Controller
 Template/Plugin
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Apr 2014 21:57:54 -0000

Author: des
Date: Wed Apr 16 21:57:53 2014
New Revision: 264568
URL: http://svnweb.freebsd.org/changeset/base/264568

Log:
  Remove some unnecessary debugging output and silence a deprecation warning.

Modified:
  user/des/fbp/lib/FBP/Controller/Poll.pm
  user/des/fbp/lib/FBP/Controller/Root.pm
  user/des/fbp/lib/Template/Plugin/WikiFormat.pm

Modified: user/des/fbp/lib/FBP/Controller/Poll.pm
==============================================================================
--- user/des/fbp/lib/FBP/Controller/Poll.pm	Wed Apr 16 21:47:51 2014	(r264567)
+++ user/des/fbp/lib/FBP/Controller/Poll.pm	Wed Apr 16 21:57:53 2014	(r264568)
@@ -38,7 +38,7 @@ sub poll :Chained('/') :Path :CaptureArg
 	# Retrieve user's existing vote, if any
 	my $answers = ($$psession{answers} = {});
 	foreach my $question ($poll->questions) {
-	    my $votes = $c->user->votes->search(question => $question->id);
+	    my $votes = $c->user->votes->search({ question => $question->id });
 	    $answers->{$question->id} = [ $votes->get_column('option')->all() ]
 		if $votes;
 	}

Modified: user/des/fbp/lib/FBP/Controller/Root.pm
==============================================================================
--- user/des/fbp/lib/FBP/Controller/Root.pm	Wed Apr 16 21:47:51 2014	(r264567)
+++ user/des/fbp/lib/FBP/Controller/Root.pm	Wed Apr 16 21:57:53 2014	(r264568)
@@ -30,7 +30,6 @@ Common code for every action
 sub auto :Private {
     my ($self, $c) = @_;
 
-    $c->log->debug("FBP::Controller::Root::auto()");
     # Stash various constants
     $c->stash(title => $c->config->{'title'});
 

Modified: user/des/fbp/lib/Template/Plugin/WikiFormat.pm
==============================================================================
--- user/des/fbp/lib/Template/Plugin/WikiFormat.pm	Wed Apr 16 21:47:51 2014	(r264567)
+++ user/des/fbp/lib/Template/Plugin/WikiFormat.pm	Wed Apr 16 21:57:53 2014	(r264568)
@@ -56,7 +56,6 @@ The filter function.
 sub filter($$) {
     my ($self, $raw) = @_;
 
-    print(STDERR "Template::Plugin::WikiFormat::filter()\n");
     return Text::WikiFormat::format($raw, $TAGS, $OPTIONS);
 }