Jordi Boggiano 12 роки тому
батько
коміт
9bc9d4bdc1

+ 1 - 3
src/Packagist/WebBundle/Entity/VersionRepository.php

@@ -89,9 +89,7 @@ class VersionRepository extends EntityRepository
         if ($vendor) {
             $qb->andWhere('p.name LIKE ?0');
             $qb->setParameter(0, $vendor.'/%');
-        }
-
-        if ($package) {
+        } elseif ($package) {
             $qb->andWhere('p.name = ?0')
                 ->setParameter(0, $package);
         }

+ 2 - 2
src/Packagist/WebBundle/Resources/views/Feed/feeds.html.twig

@@ -9,11 +9,11 @@
         <p>Newly Submitted Packages: <a href="{{ url('feed_packages', {_format: 'rss'}) }}">RSS</a>, <a href="{{ url('feed_packages', {_format: 'atom'}) }}">Atom</a></p>
         <p>New Releases: <a href="{{ url('feed_releases', {_format: 'rss'}) }}">RSS</a>, <a href="{{ url('feed_releases', {_format: 'atom'}) }}">Atom</a></p>
 
-        <h2>Vendor Feeds</h2>
+        <h2>Vendor Feed</h2>
         <p>New Releases for a specific vendor namespace: <code>{{ url('feed_vendor', {vendor: 'XXX', _format: 'rss'})|replace({XXX: '%vendor%'}) }}</code></p>
         <p>Replace <code>%vendor%</code> by the vendor name, and change rss to atom if you would like an atom feed.</p>
 
-        <h2>Package Feeds</h2>
+        <h2>Package Feed</h2>
         <p>New Releases for a specific package: <code>{{ url('feed_package', {package: 'X/X', _format: 'rss'})|replace({'X/X': '%vendor/package%'}) }}</code></p>
         <p>Replace <code>%vendor/package%</code> by the package name, and change rss to atom if you would like an atom feed.</p>
     </div>