Merge pull request #2041 from Mark-M/patch-1

FIX Deprecation $manifest not in global scope
This commit is contained in:
Ingo Schommer 2013-06-03 00:30:26 -07:00
commit d5510f54b3

View File

@ -88,7 +88,7 @@ class Deprecation {
$callingfile = realpath($backtrace[1]['file']); $callingfile = realpath($backtrace[1]['file']);
global $manifest; $manifest = SS_ClassLoader::instance()->getManifest();
foreach ($manifest->getModules() as $name => $path) { foreach ($manifest->getModules() as $name => $path) {
if (strpos($callingfile, realpath($path)) === 0) { if (strpos($callingfile, realpath($path)) === 0) {
return $name; return $name;