Merge pull request #36 from mrjf/master

in Swagger.php, use dirname instead of grepping for slash, which could be / or \
This commit is contained in:
mrjf 2013-03-06 10:08:13 -08:00
commit f22dbc510d
3 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@
* @param string $className the class to attempt to load * @param string $className the class to attempt to load
*/ */
function swagger_autoloader($className) { function swagger_autoloader($className) {
$currentDir = substr(__FILE__, 0, strrpos(__FILE__, '/')); $currentDir = dirname(__FILE__);
if (file_exists($currentDir . '/' . $className . '.php')) { if (file_exists($currentDir . '/' . $className . '.php')) {
include $currentDir . '/' . $className . '.php'; include $currentDir . '/' . $className . '.php';
} elseif (file_exists($currentDir . '/models/' . $className . '.php')) { } elseif (file_exists($currentDir . '/models/' . $className . '.php')) {

View File

@ -11,7 +11,7 @@
* @param string $className the class to attempt to load * @param string $className the class to attempt to load
*/ */
function swagger_autoloader($className) { function swagger_autoloader($className) {
$currentDir = substr(__FILE__, 0, strrpos(__FILE__, '/')); $currentDir = dirname(__FILE__);
if (file_exists($currentDir . '/' . $className . '.php')) { if (file_exists($currentDir . '/' . $className . '.php')) {
include $currentDir . '/' . $className . '.php'; include $currentDir . '/' . $className . '.php';
} elseif (file_exists($currentDir . '/models/' . $className . '.php')) { } elseif (file_exists($currentDir . '/models/' . $className . '.php')) {

View File

@ -11,7 +11,7 @@
* @param string $className the class to attempt to load * @param string $className the class to attempt to load
*/ */
function swagger_autoloader($className) { function swagger_autoloader($className) {
$currentDir = substr(__FILE__, 0, strrpos(__FILE__, '/')); $currentDir = dirname(__FILE__);
if (file_exists($currentDir . '/' . $className . '.php')) { if (file_exists($currentDir . '/' . $className . '.php')) {
include $currentDir . '/' . $className . '.php'; include $currentDir . '/' . $className . '.php';
} elseif (file_exists($currentDir . '/models/' . $className . '.php')) { } elseif (file_exists($currentDir . '/models/' . $className . '.php')) {