git99969
diff --git a/‎phpQuery/phpQuery.php‎
Lines changed: 13 additions & 2 deletions b/‎phpQuery/phpQuery.php‎
Lines changed: 13 additions & 2 deletions
@@ -295,6 +295,13 @@ public static function phpToMarkup($php, $charset = 'utf-8') {
 		$php = preg_replace($regex, '\\1<php><!-- \\3 --></php>', $php);
 		return $php;
 	}
+	/**
+	 * Converts document markup containing PHP code generated by phpQuery::php()
+	 * into valid (executable) PHP code syntax.
+	 * 
+	 * @param string|phpQueryObject $content
+	 * @return string PHP code.
+	 */
 	public static function markupToPHP($content) {
 		if ($content instanceof phpQueryObject)
 			$content = $content->markupOuter();
@@ -311,6 +318,7 @@ public static function markupToPHP($content) {
 			array('<?php', '<?php', '?>', '?>'),
 			$content
 		);*/
+		/* <node attr='<?php ?>'> */
 		$regexes = array(
 			'@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(\')([^\']*)(?:&lt;|%3C)\\?(?:php)?(.*?)(?:\\?(?:&gt;|%3E))([^\']*)\'@s',
 			'@(<(?!\\?)(?:[^>]|\\?>)+\\w+\\s*=\\s*)(")([^"]*)(?:&lt;|%3C)\\?(?:php)?(.*?)(?:\\?(?:&gt;|%3E))([^"]*)"@s',
@@ -970,7 +978,10 @@ public static function browser($ajaxSettings, $callback, $param1 = null, $param2
 		}
 	}
 	public static function php($code) {
-		return "<php><!-- ".trim($code)." --></php>";
+		return self::code('php', $code);
+	}
+	public static function code($type, $code) {
+		return "<$type><!-- ".trim($code)." --></$type>";
 	}
 }
 /**
@@ -989,7 +1000,7 @@ public function __call($method, $args) {
 				array($realClass, $method),
 				$args
 			);
-			return $return
+			return isset($return)
 				? $return
 				: $this;
 		} else