X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fframework.php;h=620730370f4c8d75a64a6ba71aea338cbe1e9f82;hb=73dbc5ca1b203758693f73d6423fea71ef6b6fb6;hp=8b47197e76a6226330a578b0c95fe1ab0e164375;hpb=3251ef3b518ef9db55fbab0693d8b0f654dcda58;p=quix0rs-gnu-social.git diff --git a/lib/framework.php b/lib/framework.php index 8b47197e76..620730370f 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -23,7 +23,7 @@ define('GNUSOCIAL_ENGINE', 'GNU social'); define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/'); define('GNUSOCIAL_BASE_VERSION', '1.2.0'); -define('GNUSOCIAL_LIFECYCLE', 'beta2'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' +define('GNUSOCIAL_LIFECYCLE', 'beta4'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); @@ -138,15 +138,15 @@ spl_autoload_register('GNUsocial_class_autoload'); * and is available here: http://www.php-fig.org/psr/psr-0/ */ spl_autoload_register(function($class){ - $class_path = preg_replace('{\\\\|_(?!.*\\\\)}', DIRECTORY_SEPARATOR, ltrim($class, '\\')).'.php'; - $file = INSTALLDIR.'/extlib/'.$class_path; + $class_base = preg_replace('{\\\\|_(?!.*\\\\)}', DIRECTORY_SEPARATOR, ltrim($class, '\\')); + $file = INSTALLDIR."/extlib/{$class_base}.php"; if (file_exists($file)) { require_once $file; return; } # Try if the system has this external library - $file = '/usr/share/php/'.$class_path; + $file = "/usr/share/php/{$class_base}.php"; if (file_exists($file)) { require_once $file; return;