Changeset 639 for trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include

Timestamp:

Aug 23, 2010, 10:01:59 AM (14 years ago)

Author:

toemon

Message:

ナビアイコン設定時、ソースが有効であるかチェックする Fixes#361

Location:

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include

Files:

• custom_functions.php (modified) (1 diff)
• xpress_common_functions.php (modified) (1 diff)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -483 +483 @@
         return ( strlen($str) - $start <= $length ) ? substr( $str, $start, $length ) : substr( $str, $start, $length - strlen($trimmarker) ) . $trimmarker;
     }
-}
-
-function icon_exists($str = '')
-{
-        global $xpress_config;
-        $root_path = $_SERVER['DOCUMENT_ROOT'];
-        $root_pattern = str_replace(".","\.",$root_path);
-        $root_pattern = '/'. str_replace("/","\/",$root_pattern) . '/';
-        $host = str_replace(".","\.",$_SERVER['SERVER_NAME']);
-        $pattern = "/https?:\/\/{$host}/";
-        if (preg_match($pattern,$str)){
-                $str = preg_replace($pattern,$root_path,$str);
-        } else if (!preg_match($root_pattern,$str)){
-                $str = $root_path.$str;
-        }
-        return file_exists($str);
 }
 

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -417 +417 @@
 }
 
+function icon_exists($str = '')
+{
+        global $xpress_config;
+        if (empty($str)) return false;
+        $root_path = $_SERVER['DOCUMENT_ROOT'];
+        $root_pattern = str_replace(".","\.",$root_path);
+        $root_pattern = '/'. str_replace("/","\/",$root_pattern) . '/';
+        $host = str_replace(".","\.",$_SERVER['SERVER_NAME']);
+        $pattern = "/https?:\/\/{$host}/";
+        if (preg_match($pattern,$str)){
+                $str = preg_replace($pattern,$root_path,$str);
+        } else if (!preg_match($root_pattern,$str)){
+                $str = $root_path.$str;
+        }
+        return file_exists($str);
+}
 ?>