From: Toni Jussila <toni.jussila@gmail.com>
Date: Thu, 27 May 2010 07:07:19 +0000 (+0300)
Subject: Merge branch 'registerdialog'
X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=52aa08b0127f4a19192c3a68eeeede9a3d61321c;hp=2cff5ca17d324f817ff283782e5a4bd242a27cbc

Merge branch 'registerdialog'
---

diff --git a/Server/application/controllers/results.php b/Server/application/controllers/results.php
index 71a63d3..8227fca 100644
--- a/Server/application/controllers/results.php
+++ b/Server/application/controllers/results.php
@@ -1,4 +1,4 @@
- <?php defined('SYSPATH') OR die('No direct access allowed.');
+<?php defined('SYSPATH') OR die('No direct access allowed.');
 /*
  * API controller for managing and viewing results and categories
  * 
diff --git a/Server/application/views/api/categories.php b/Server/application/views/api/categories.php
index 334f4ea..aec137b 100644
--- a/Server/application/views/api/categories.php
+++ b/Server/application/views/api/categories.php
@@ -1,4 +1,4 @@
-<?php echo "<?"; ?>xml version="1.0" encoding="utf-8" <?php echo "?>"; ?>
+<?php echo '<?xml version="1.0" encoding="utf-8"?>'; ?>
 
 <categories>
     <?php foreach ($categories as $k){ ?>   <category description="<?php echo $k->description; ?>" unit="<?php echo $k->unit; ?>"><?php echo $k->slug; ?></category>