Fix ereg->preg updates

osCommerce · Sep 10, 2009 · bc2bcd9 · bc2bcd9
1 parent 8a9dd05
commit bc2bcd9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/catalog/admin/file_manager.php b/catalog/admin/file_manager.php
@@ -26,7 +26,7 @@
 
   if (!is_dir($current_path)) $current_path = DIR_FS_DOCUMENT_ROOT;
 
-  if (!preg_match('/^/' . DIR_FS_DOCUMENT_ROOT, $current_path)) $current_path = DIR_FS_DOCUMENT_ROOT;
+  if (!preg_match('/^' . DIR_FS_DOCUMENT_ROOT . '/', $current_path)) $current_path = DIR_FS_DOCUMENT_ROOT;
 
   $action = (isset($HTTP_GET_VARS['action']) ? $HTTP_GET_VARS['action'] : '');
 

diff --git a/catalog/admin/includes/functions/general.php b/catalog/admin/includes/functions/general.php
@@ -146,7 +146,7 @@ function tep_date_short($raw_date) {
     if (@date('Y', mktime($hour, $minute, $second, $month, $day, $year)) == $year) {
       return date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, $year));
     } else {
-      return preg_replace('/2037/' . '$', $year, date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, 2037)));
+      return preg_replace('/2037$/', $year, date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, 2037)));
     }
 
   }
@@ -939,7 +939,7 @@ function tep_reset_cache_block($cache_block) {
               $languages = tep_get_languages();
               for ($j=0, $k=sizeof($languages); $j<$k; $j++) {
                 $cached_file_unlink = preg_replace('/-language/', '-' . $languages[$j]['directory'], $cached_file);
-                if (preg_match('/^/' . $cached_file_unlink, $cache_file)) {
+                if (preg_match('/^' . $cached_file_unlink . '/', $cache_file)) {
                   @unlink(DIR_FS_CACHE . $cache_file);
                 }
               }

diff --git a/catalog/includes/functions/general.php b/catalog/includes/functions/general.php
@@ -584,7 +584,7 @@ function tep_date_short($raw_date) {
     if (@date('Y', mktime($hour, $minute, $second, $month, $day, $year)) == $year) {
       return date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, $year));
     } else {
-      return preg_replace('/2037/' . '$', $year, date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, 2037)));
+      return preg_replace('/2037$/', $year, date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, 2037)));
     }
   }