Skip to content
This repository has been archived by the owner on Feb 20, 2020. It is now read-only.

Commit

Permalink
Merge branch 'development' of github.com:Xeoncross/micromvc into deve…
Browse files Browse the repository at this point in the history
…lopment
  • Loading branch information
xeoncross committed Jul 15, 2011
2 parents ea92727 + 29e2dd6 commit fb328ef
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README/install.txt
Expand Up @@ -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.

Expand Down
3 changes: 1 addition & 2 deletions bootstrap.php
Expand Up @@ -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)));
}


Expand Down
2 changes: 1 addition & 1 deletion system/curl.php
Expand Up @@ -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')));
}


Expand Down

0 comments on commit fb328ef

Please sign in to comment.