refs #514 : merge with 2.0 tree.

Needlworks · Feb 25, 2011 · f13bf13 · f13bf13
2 parents b1d2504 + 35e4510
commit f13bf13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/framework/id/textcube/config.default.php b/framework/id/textcube/config.default.php
@@ -61,5 +61,5 @@
 $service['debug_rewrite_module'] = false;
 $service['useNumericURLonRSS'] = false;
 $service['forceinstall'] = false;
-$service['jqueryURL'] = "";	// You can change this to use external CDNs. (microsoft / google, etc..)
+$service['jqueryURL'] = null;	// You can change this to use external CDNs. (microsoft / google, etc..)
 ?>
diff --git a/interface/i/index.php b/interface/i/index.php
@@ -11,7 +11,7 @@
 	<ul id="home" title="<?php echo htmlspecialchars(Utils_Unicode::lessenAsEm($context->getProperty('blog.title'),30));?>" selected="true">
 	<?php
 		$blogAuthor = User::getBlogOwnerName($blogid);
-		$blogLogo = !empty($context->getProperty('blog.logo')) ? printIphoneImageResizer($blogid, $context->getProperty('blog.logo'), 80) : "{$context->getProperty('service.path')}/resources/style/iphone/image/textcube_logo.png";
+		$blogLogo = !is_null($context->getProperty('blog.logo')) ? printIphoneImageResizer($blogid, $context->getProperty('blog.logo'), 80) : "{$context->getProperty('service.path')}/resources/style/iphone/image/textcube_logo.png";
 		$itemsView = '<li class="blog_info">'.CRLF;
 		$itemsView .= '	<div class="logo"><img src="' . $blogLogo . '" /></div>'.CRLF;
 		$itemsView .= '	<div class="blog_container">'.CRLF;

diff --git a/library/model/blog.comment.php b/library/model/blog.comment.php
@@ -271,10 +271,10 @@ function getCommentAttributes($blogid, $id, $attributeNames) {
 
 function getComments($entry) {
 	$comments = array();
-
+	$context = Model_Context::getInstance();
 	$pool = DBModel::getInstance();
 	$pool->reset('Comments');
-	$pool->setQualifier('blogid','eq',$blogid);
+	$pool->setQualifier('blogid','eq',$context->getProperty('blog.id'));
 	$pool->setQualifier('entry','eq',$entry);
 	$pool->setQualifier('parent','eq',NULL);
 	$pool->setQualifier('isfiltered','eq',0);