GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Updating Markdown class + use spl_autoload_register

Browse Source 
spl_autoload_register now calls the GNUsocial_class_autoload function
instead of us replacing the magic __autoload($cls). This means we can
queue up other autoload functions, such as the one now used for extlib
functions which exist directly in the 'extlib/' folder or have proper
namespacing (which our new Markdown class does).
This commit is contained in:
Mikael Nordfeldth
2014-03-18 10:46:24 +01:00
parent 7cd3879306
commit 3d0994bcca
7 changed files with 3196 additions and 1735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/framework.php
View File

@@ -105,7 +105,7 @@ function _have_config()
return StatusNet::haveConfig();
}
function __autoload($cls)
function GNUsocial_class_autoload($cls)
{
if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
require_once(INSTALLDIR.'/classes/' . $cls . '.php');
@@ -125,23 +125,17 @@ function __autoload($cls)
// XXX: note that these files should not use config options
// at compile time since DB config options are not yet loaded.
require_once 'Validate.php';
require_once 'markdown.php';
// Autoload queue
spl_autoload_register('GNUsocial_class_autoload');
// XXX: other formats here
/**
* Avoid the NICKNAME_FMT constant; use the Nickname class instead.
*
* Nickname::DISPLAY_FMT is more suitable for inserting into regexes;
* note that it includes the [] and repeating bits, so should be wrapped
* directly in a capture paren usually.
*
* For validation, use Nickname::normalize(), Nickname::isValid() etc.
*
* @deprecated
*/
define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
// Extlibs with namespaces (or directly in extlib/)
// such as: Validate and \Michelf\Markdown
spl_autoload_register(function($class){
$file = INSTALLDIR.'/extlib/'.preg_replace('{\\\\|_(?!.*\\\\)}', DIRECTORY_SEPARATOR, ltrim($class, '\\')).'.php';
if (file_exists($file)) {
require_once $file;
}
});
require_once INSTALLDIR.'/lib/util.php';
require_once INSTALLDIR.'/lib/action.php';