Browse Source

Merge branch 'phalcon-fix' into php-fixes

Keith Newman 9 years ago
parent
commit
ead053c9b0

+ 1 - 1
frameworks/PHP/phalcon/.gitignore

@@ -1,6 +1,6 @@
 /app/cache
 /app/cache
 /app/logs
 /app/logs
-/app/compiled-templates/
+/app/compiled-templates/*.compiled
 /bin
 /bin
 /vendors
 /vendors
 /build
 /build

+ 0 - 0
frameworks/PHP/phalcon/app/compiled-templates/.blank


+ 1 - 1
frameworks/PHP/phalcon/public/index.php

@@ -25,7 +25,7 @@ try {
         if (function_exists('apc_store')) {
         if (function_exists('apc_store')) {
             return new Phalcon\Mvc\Model\MetaData\Apc();
             return new Phalcon\Mvc\Model\MetaData\Apc();
         } else {
         } else {
-            return new Phalcon\Mvc\Model\MetaData\Files(array(
+            return new Phalcon\Mvc\Model\MetaData\Memory(array(
                 'metaDataDir' => APP_PATH . "/app/compiled-templates/"
                 'metaDataDir' => APP_PATH . "/app/compiled-templates/"
             ));
             ));
         }
         }