Merge branch '2.1'

sonata-project · Mar 27, 2013 · 89f2df2 · 89f2df2
2 parents 60e8ffa + e13a41a
commit 89f2df2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Model/Post.php b/Model/Post.php
@@ -355,7 +355,7 @@ public function getCommentsCount()
      */
     public function __toString()
     {
-        return $this->getTitle();
+        return $this->getTitle() ?: 'n/a';
     }
 
     /**

diff --git a/Model/Tag.php b/Model/Tag.php
@@ -171,6 +171,6 @@ public function getPosts()
      */
     public function __toString()
     {
-        return $this->getName();
+        return $this->getName() ?: 'n/a';
     }
 }
diff --git a/README.rst → README.md b/README.rst → README.md