Permalink
Browse files

Merge branch 'hotfix/40'

Close #40
  • Loading branch information...
2 parents e654266 + aec0874 commit e959aca15cc0e3ce20d4168c814cf5adb947aeac @weierophinney weierophinney committed Oct 2, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 module/PageController/view/page-controller/about/faq.phtml
  2. +1 −1 rewrites.php
@@ -57,12 +57,12 @@ $headTitle->prepend('FAQ');
<dd>Absolutely. An important part of Zend Framework 2 is the migration layer that will allow ZF 1 code to run on the new ZF 2 engine, which will be made available in the future. With it, you will be able to add new ZF 2 code, and refactor existing code, at a controlled pace. </dd>
<dt>I’m starting a new project – which version of Zend Framework should I use?</dt>
- <dd>If the project will complete mid-2012 or later, start using Zend Framework 2! The current beta 3 is a great opportunity to begin acquainting yourself with the main features, and the feature-complete beta 4 and GA releases will follow quickly.</dd>
+ <dd>Start using Zend Framework 2! It's already stable.</dd>
<dt>What version of PHP is Zend Framework 2 based on?</dt>
<dd>Zend Framework 2 is based on PHP 5.3. We expect to add support for PHP 5.4 once it starts to be adopted by the PHP community.</dd>
- <dt>I’m convinced, where can I try out the latest beta release?</dt>
+ <dt>I’m convinced, where can I try out the latest release?</dt>
<dd>You can download the latest build from <a href="http://packages.zendframework.com">http://packages.zendframework.com</a>. You can also get more information about the Zend Framework 2 project at <a href="http://framework.zend.com/zf2/">http://framework.zend.com/zf2/</a>. </dd>
</dl>
View
@@ -73,7 +73,7 @@
$rewrite($rewriteUri);
return;
}
- $replacements = array();
+
foreach ($matches as $key => $value) {
if (is_int($key) || is_numeric($key)) {
continue;

0 comments on commit e959aca

Please sign in to comment.