summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2009-03-11 18:01:14 +0100
committerDerek Jones <derek.jones@ellislab.com>2009-03-11 18:01:14 +0100
commit1322ec54289f09f7e176924902d5642f269aec48 (patch)
tree96df3c6bc3d27d3a494b67f9f855850d600e4323 /system/libraries
parent28e5c8fc0ed79017a67b896613698e98fa7da8b3 (diff)
ereg eradication
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Image_lib.php8
-rw-r--r--system/libraries/Trackback.php7
2 files changed, 6 insertions, 9 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 2896c9e07..1e1ae7db1 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -350,7 +350,7 @@ class CI_Image_lib {
{
$protocol = 'image_process_'.$this->image_library;
- if (eregi("gd2$", $protocol))
+ if (preg_match('/gd2$/i', $protocol))
{
$protocol = 'image_process_gd';
}
@@ -373,7 +373,7 @@ class CI_Image_lib {
{
$protocol = 'image_process_'.$this->image_library;
- if (eregi("gd2$", $protocol))
+ if (preg_match('/gd2$/i', $protocol))
{
$protocol = 'image_process_gd';
}
@@ -559,9 +559,9 @@ class CI_Image_lib {
return FALSE;
}
- if ( ! eregi("convert$", $this->library_path))
+ if ( ! preg_match("/convert$/i", $this->library_path))
{
- if ( ! eregi("/$", $this->library_path)) $this->library_path .= "/";
+ $this->library_path = rtrim($this->library_path, '/').'/';
$this->library_path .= 'convert';
}
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
index 844e50364..d53f17fef 100644
--- a/system/libraries/Trackback.php
+++ b/system/libraries/Trackback.php
@@ -267,7 +267,7 @@ class CI_Trackback {
}
@fclose($fp);
- if ( ! eregi("<error>0</error>", $this->response))
+ if (stristr($this->response, '<error>0</error>') === FALSE)
{
$message = 'An unknown error was encountered';
@@ -370,10 +370,7 @@ class CI_Trackback {
}
else
{
- if (ereg("/$", $url))
- {
- $url = substr($url, 0, -1);
- }
+ $url = rtrim($url, '/');
$tb_array = explode('/', $url);
$tb_id = $tb_array[count($tb_array)-1];