@@ -909,7 +909,7 @@ public static function escape_html($src, $nl2br = false) {
909
909
if (is_array ($ src )) {
910
910
return array_map ([__CLASS__ , 'escape_html ' ], $ src );
911
911
} else if (is_object ($ src )) {
912
- return (object )array_map ([__CLASS__ , 'escape_html ' ] , object_to_array ($ src ));
912
+ return (object )array_map ([__CLASS__ , 'escape_html ' ] , self :: to_array ($ src ));
913
913
} else {
914
914
if (is_null ($ src )) $ src = "" ;
915
915
$ new_str = is_string ($ src ) ? htmlentities (html_entity_decode ($ src , ENT_QUOTES )) : $ src ;
@@ -921,7 +921,7 @@ public static function descape_html($src) {
921
921
if (is_array ($ src )) {
922
922
return array_map ([__CLASS__ , 'descape_html ' ], $ src );
923
923
} else if (is_object ($ src )) {
924
- return (object )array_map ([__CLASS__ , 'descape_html ' ], object_to_array ($ src ));
924
+ return (object )array_map ([__CLASS__ , 'descape_html ' ], self :: to_array ($ src ));
925
925
} else {
926
926
if (is_null ($ src )) $ src = "" ;
927
927
$ new_str = is_string ($ src ) ? html_entity_decode ($ src , ENT_QUOTES ) : $ src ;
@@ -942,29 +942,29 @@ public static function br2nl($text) {
942
942
* @param object $object The object to convert
943
943
* @reeturn array
944
944
*/
945
- public static function object_to_array ($ object ) {
945
+ public static function to_array ($ object ) {
946
946
if (is_array ($ object )) return $ object ;
947
947
if (!is_object ($ object ) && !is_array ($ object )) return $ object ;
948
948
if (is_object ($ object )) $ object = get_object_vars ($ object );
949
949
950
950
return array_map ([
951
951
__CLASS__ ,
952
- 'object_to_array '
952
+ 'to_array '
953
953
], $ object );
954
954
}
955
955
/**
956
956
* Convert an array to an object
957
957
* @param array $array The array to convert
958
958
* @reeturn object
959
959
*/
960
- public static function array_to_object ($ array , $ recursive = false ) {
960
+ public static function to_object ($ array , $ recursive = false ) {
961
961
if (!is_object ($ array ) && !is_array ($ array )) return $ array ;
962
962
963
963
if (!$ recursive ) return (object )$ array ;
964
964
965
965
if (is_array ($ array )) return (object )array_map ([
966
966
__CLASS__ ,
967
- 'array_to_object '
967
+ 'to_object '
968
968
], $ array );
969
969
else return $ array ;
970
970
}
0 commit comments