diff options
| author | Joel Kallman <jkallman@eclarian.com> | 2012-03-12 23:10:44 +0100 |
|---|---|---|
| committer | Joel Kallman <jkallman@eclarian.com> | 2012-03-12 23:10:44 +0100 |
| commit | 7c4870c3741e165bc7bc06624c816e66db474ee2 (patch) | |
| tree | a96962212cb012be32ab09545dcd5c4dbdac05e2 /system/helpers/xml_helper.php | |
| parent | 10aa8e660c6f439958b79fce5d85ce7e8eecf028 (diff) | |
| parent | 6b535f51fcb94e0a645fda0d0356f4748076877e (diff) | |
Merge branch 'develop' into feature/db_toString_support
Diffstat (limited to 'system/helpers/xml_helper.php')
| -rw-r--r-- | system/helpers/xml_helper.php | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php index 0cf8f13dc..f3ff5764c 100644 --- a/system/helpers/xml_helper.php +++ b/system/helpers/xml_helper.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Open Software License version 3.0 - * + * * This source file is subject to the Open Software License (OSL 3.0) that is * bundled with this package in the files license.txt / license.rst. It is * also available through the world wide web at this URL: @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) * @link http://codeigniter.com * @since Version 1.0 @@ -56,28 +56,26 @@ if ( ! function_exists('xml_convert')) // ampersands won't get messed up $str = preg_replace("/&#(\d+);/", "$temp\\1;", $str); - if ($protect_all === TRUE) + if ($protect_all == TRUE) { - $str = preg_replace("/&(\w+);/", "$temp\\1;", $str); + $str = preg_replace('/&(\w+);/', "$temp\\1;", $str); } - $str = str_replace(array("&","<",">","\"", "'", "-"), - array("&", "<", ">", """, "'", "-"), - $str); + $str = str_replace(array('&', '<', '>', '"', "'", '-'), + array('&', '<', '>', '"', ''', '-'), + $str); // Decode the temp markers back to entities - $str = preg_replace("/$temp(\d+);/","&#\\1;",$str); + $str = preg_replace('/$temp(\d+);/', '&#\\1;', $str); - if ($protect_all === TRUE) + if ($protect_all == TRUE) { - $str = preg_replace("/$temp(\w+);/","&\\1;", $str); + return preg_replace("/$temp(\w+);/", '&\\1;', $str); } return $str; } } -// ------------------------------------------------------------------------ - /* End of file xml_helper.php */ -/* Location: ./system/helpers/xml_helper.php */
\ No newline at end of file +/* Location: ./system/helpers/xml_helper.php */ |