Commit: a3fa0899f3ed1b3138bb86f22a27a49916843ac4

Author: Jon Adams | Date: 2010-03-01 22:11:16 -0800
Fix for namespace change for g11n and strict standards error with Docs::_merge method
diff --git a/extensions/adapter/g11n/catalog/Docs.php b/extensions/adapter/g11n/catalog/Docs.php index 6051428..58c26eb 100644 --- a/extensions/adapter/g11n/catalog/Docs.php +++ b/extensions/adapter/g11n/catalog/Docs.php @@ -16,7 +16,7 @@ use \lithium\analysis\Inspector; use \lithium\analysis\Docblock; use \lithium\util\Set; -class Docs extends \lithium\g11n\catalog\adapter\Base { +class Docs extends \lithium\g11n\catalog\Adapter { /** * Constructor. @@ -147,7 +147,7 @@ class Docs extends \lithium\g11n\catalog\adapter\Base { * @return void * @see lithium\g11n\catalog\adapter\Base::_merge() */ - protected function _merge($data, $item) { + protected function _merge(array $data, array $item) { $cleanup = function($text) { return preg_replace('/\n\s+-\s/msi', "\n\n - ", $text); };