From 9505bd0c8b12d0b822076a48b4e8a554a1d4f5fa Mon Sep 17 00:00:00 2001
From: "tobiasz.cudnik" <tobiasz.cudnik@afc5ee8f-4a33-0410-9214-8715c29b7d85>
Date: Sat, 10 Oct 2009 08:55:05 +0000
Subject: [PATCH] - fixed ajax() notices - fixed #132 DOMDocumentWrapper typo -
 fixed load() when no mb_string extension - added new ajax test case for #130

git-svn-id: http://phpquery.googlecode.com/svn/branches/dev@392 afc5ee8f-4a33-0410-9214-8715c29b7d85
---
 phpQuery/phpQuery.php                    |  2 ++
 phpQuery/phpQuery/DOMDocumentWrapper.php |  2 +-
 phpQuery/phpQuery/phpQueryObject.php     |  2 +-
 test-cases/test_ajax.php                 | 28 +++++++++++++++++++++---
 test-cases/test_ajax_data_1              |  1 +
 5 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 test-cases/test_ajax_data_1

diff --git a/phpQuery/phpQuery.php b/phpQuery/phpQuery.php
index 5d214ad..08f22fc 100644
--- a/phpQuery/phpQuery.php
+++ b/phpQuery/phpQuery.php
@@ -94,6 +94,8 @@ abstract class phpQuery {
 		'data' => null,
 		'username' => null,
 		'password' => null,
+		'dataType' => null,
+		'ifModified' => null,
 		'accepts' => array(
 			'xml' => "application/xml, text/xml",
 			'html' => "text/html",
diff --git a/phpQuery/phpQuery/DOMDocumentWrapper.php b/phpQuery/phpQuery/DOMDocumentWrapper.php
index 0b6a7fd..13038cb 100644
--- a/phpQuery/phpQuery/DOMDocumentWrapper.php
+++ b/phpQuery/phpQuery/DOMDocumentWrapper.php
@@ -386,7 +386,7 @@ protected function charsetAppendToHTML($html, $charset, $xhtml = false) {
 			.($xhtml ? '/' : '')
 			.'>';
 		if (strpos($html, '<head') === false) {
-			if (strpos($hltml, '<html') === false) {
+			if (strpos($html, '<html') === false) {
 				return $meta.$html;
 			} else {
 				return preg_replace(
diff --git a/phpQuery/phpQuery/phpQueryObject.php b/phpQuery/phpQuery/phpQueryObject.php
index 146ddc8..e24d77b 100644
--- a/phpQuery/phpQuery/phpQueryObject.php
+++ b/phpQuery/phpQuery/phpQueryObject.php
@@ -1329,7 +1329,7 @@ public function load($url, $data = null, $callback = null) {
 			if (extension_loaded('mbstring') && phpQuery::$mbstringSupport)
 				mb_ereg('^([^ ]+) (.*)$', $url, $matches);
 			else
-				preg_match('^([^ ]+) (.*)$', $url, $matches);
+				preg_match('@^([^ ]+) (.*)$@', $url, $matches);
 			$url = $matches[1];
 			$selector = $matches[2];
 			// FIXME this sucks, pass as callback param
diff --git a/test-cases/test_ajax.php b/test-cases/test_ajax.php
index 8fed6f3..5058e58 100755
--- a/test-cases/test_ajax.php
+++ b/test-cases/test_ajax.php
@@ -1,11 +1,11 @@
 <?php
 //error_reporting(E_ALL);
 set_include_path(
-	get_include_path()
-	.':/home/bob/Sources/PHP/zend-framework/'
+	get_include_path().PATH_SEPARATOR
+	.'zend-framework/'
 );
 
-require_once('../phpQuery/phpQuery.php');
+require_once('../phpQuery/phpQuery.php');
 phpQuery::$debug = true;
 phpQuery::$ajaxAllowedHosts[] = 'wikipedia.org';
 phpQuery::$ajaxAllowedHosts[] = 'google.com';
@@ -45,6 +45,28 @@
 print "\n";
 
 
+// http://code.google.com/p/phpquery/issues/detail?id=130
+$pq = phpQuery::ajax(array(
+	'url' => 'http://'.$_SERVER['SERVER_NAME'].preg_replace('@/[^/]+$@', '/test_ajax_data_1', $_SERVER['REQUEST_URI']),
+	'success' => 'a789fhasdui3124',
+	'error' => 'jhdbg786213u8dsfg7y'
+));
+function a789fhasdui3124($html) {
+	$testName = 'AJAX request text node';
+	if ( $html == 'hello world' )
+		print "Test '$testName' PASSED :)";
+	else {
+		print "Test '$testName' <strong>FAILED</strong> !!! ";
+	}
+	print "\n";
+}
+
+function jhdbg786213u8dsfg7y() {
+	$testName = 'AJAX request text node';
+	print "Test '$testName' <strong>FAILED</strong> !!! ";
+}
+
+
 //$testName = 'gdata plugin';
 //phpQuery::extend('gdata');
 //$xhr = phpQuery::$plugins->gdata('tobiasz.cudnik@gmail.com', 'XXX');
diff --git a/test-cases/test_ajax_data_1 b/test-cases/test_ajax_data_1
new file mode 100644
index 0000000..95d09f2
--- /dev/null
+++ b/test-cases/test_ajax_data_1
@@ -0,0 +1 @@
+hello world
\ No newline at end of file