From 3688e8fa921f24f74d2adfeaa695162a56195507 Mon Sep 17 00:00:00 2001 From: Eddie Monge Date: Thu, 9 Jun 2011 01:51:37 -0700 Subject: [PATCH 1/2] minor changes to combine.php --- combine.php | 17 ++++++++--------- js/index.php | 3 +-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/combine.php b/combine.php index c70c6bca..294076c1 100644 --- a/combine.php +++ b/combine.php @@ -1,18 +1,17 @@ \ No newline at end of file +header('Content-Type: ' . $type); +header('Content-Length: ' . strlen($contents)); +echo $contents; \ No newline at end of file diff --git a/js/index.php b/js/index.php index d901581a..0a853e54 100644 --- a/js/index.php +++ b/js/index.php @@ -30,5 +30,4 @@ $elements = array( 'jquery.mobile.init.js' ); -include('../combine.php'); -?> +include('../combine.php'); \ No newline at end of file From d508c3da96d0d887555aeef96a31ba47fae5dc34 Mon Sep 17 00:00:00 2001 From: Eddie Monge Date: Thu, 9 Jun 2011 09:31:42 -0700 Subject: [PATCH 2/2] remove ASP style tags, closing PHP tags and short php code --- experiments/weather/index.php | 25 ++++++++++++------------- themes/default/index.php | 3 +-- themes/valencia/index.php | 1 - 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/experiments/weather/index.php b/experiments/weather/index.php index 3cc48afb..28f03404 100644 --- a/experiments/weather/index.php +++ b/experiments/weather/index.php @@ -1,4 +1,4 @@ -xpath("/xml_api_reply/weather/forecast_conditions"); - jQuery Mobile Framework - Weather for <?= $information[0]->city['data']; ?> + jQuery Mobile Framework - Weather for <?php echo $information[0]->city['data']; ?> @@ -47,7 +47,7 @@ $forecast_list = $xml->xpath("/xml_api_reply/weather/forecast_conditions");
- +
@@ -56,10 +56,10 @@ $forecast_list = $xml->xpath("/xml_api_reply/weather/forecast_conditions");

Currently in city['data']; ?>:

- weather + weather

- temp_f['data'] ?>° F, - condition['data'] ?> + temp_f['data']; ?>° F, + condition['data']; ?>

@@ -67,24 +67,23 @@ $forecast_list = $xml->xpath("/xml_api_reply/weather/forecast_conditions"); - \ No newline at end of file diff --git a/themes/default/index.php b/themes/default/index.php index ca6789e5..456873de 100644 --- a/themes/default/index.php +++ b/themes/default/index.php @@ -19,5 +19,4 @@ $elements = array( 'jquery.mobile.forms.slider.css' ); -include('../../combine.php'); -?> +include('../../combine.php'); \ No newline at end of file diff --git a/themes/valencia/index.php b/themes/valencia/index.php index eae46f3b..12322284 100644 --- a/themes/valencia/index.php +++ b/themes/valencia/index.php @@ -20,4 +20,3 @@ $elements = array( ); include('../../combine.php'); -?> \ No newline at end of file