Allow TextHelper to be overwritten by a package

Fixes bug described here: http://www.concrete5.org/developers/bugs/5-6-1/cannot-override-texthelper-via-custom-package/
concretecms · Mar 5, 2013 · 748a6d2 · 748a6d2
1 parent 71fa6e3
commit 748a6d2
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/web/concrete/core/libraries/loader.php b/web/concrete/core/libraries/loader.php
@@ -183,19 +183,18 @@ public static function autoload($class) {
 			if ($cl) {
 				call_user_func_array(array(__CLASS__, $cl[0]), array($cl[1], $cl[2]));
 			} else {
-				/* lets handle some things slightly more dynamically */
-				$txt = self::helper('text');
+				/* lets handle some things slightly more dynamically */				
 				if (strpos($class, 'BlockController') > 0) {
 					$class = substr($class, 0, strpos($class, 'BlockController'));
-					$handle = $txt->uncamelcase($class);
+					$handle = Object::uncamelcase($class);
 					self::block($handle);
 				} else if (strpos($class, 'AttributeType') > 0) {
 					$class = substr($class, 0, strpos($class, 'AttributeType'));
-					$handle = $txt->uncamelcase($class);
+					$handle = Object::uncamelcase($class);
 					$at = AttributeType::getByHandle($handle);
 				} else 	if (strpos($class, 'Helper') > 0) {
 					$class = substr($class, 0, strpos($class, 'Helper'));
-					$handle = $txt->uncamelcase($class);
+					$handle = Object::uncamelcase($class);
 					$handle = preg_replace('/^site_/', '', $handle);
 					self::helper($handle);
 				}