Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'development' of github.com:Xeoncross/micromvc into deve…

…lopment
  • Loading branch information...
commit fb328ef6d94ab4bcece39ed77eb0042904f6cf92 2 parents ea92727 + 29e2dd6
David Pennington authored
Showing with 3 additions and 4 deletions.
  1. +1 −1  README/install.txt
  2. +1 −2  bootstrap.php
  3. +1 −1  system/curl.php
2  README/install.txt
View
@@ -6,7 +6,7 @@ To get the MicroMVC framework up and running you must setup the server vhost usi
If you are using the Apache web server you must rename "sample.htaccess" to ".htaccess" and edit the file to match your requirements. The most important thing to set is the "RewriteBase" base path on line 37. If micromvc is installed at http://micromvc.com then the base path can be left as-is ("RewriteBase /"). However, if you were installing in http://micromvc.com/framework/ then line 37 would read "RewriteBase /framework".
-If you are using Nginx then you must already know what your doing and you can use the sample.nginx.conf as a starting point for getting MicroMVC running.
+If you are using Nginx then you must already know what you're doing and you can use the sample.nginx.conf as a starting point for getting MicroMVC running.
Sorry, but Lighttpd users will have to figure the rest out on their own until someone writes a sample vhost config.
3  bootstrap.php
View
@@ -154,8 +154,7 @@ function lang($key, $module = 'system')
*/
function __autoload($class)
{
- // System classes will *not* have an underscore
- require (mb_strtolower(SP . (strpos($class, '_') === FALSE ? 'system/' : '') . str_replace('_', '/', $class . EXT)));
+ require(SP . mb_strtolower((strpos($class, '_') === FALSE ? 'system/' : '') . str_replace('_', '/', $class . EXT)));
}
2  system/curl.php
View
@@ -23,7 +23,7 @@ class cURL
*/
public static function delete($url, array $params = array(), array $options = array())
{
- return self::request($url, $params, ($options + array(CURLOPT_CUSTOMREQUEST = >'DELETE')));
+ return self::request($url, $params, ($options + array(CURLOPT_CUSTOMREQUEST => 'DELETE')));
}
Please sign in to comment.
Something went wrong with that request. Please try again.