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

Timestamp:

Nov 24, 2009, 3:49:32 PM (15 years ago)

Author:

toemon

Message:

WordPressの一般設定の「ブログのアドレス (URL)」を変更できるようにした。
但し、アクセスが可能ＵＲＬなＵＲＬでない場合は、インデックスページ呼び出し時に修正が行われる。
fixes #249

Location:

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

Files:

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

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

@@ -190 +190 @@
 
 endif;  // Under WP2.5
+
+// Under WP2.7
+if (version_compare($xoops_config->wp_version,'2.6', '<')) :
+        /**
+         * Guess the URL for the site.
+         *
+         * Will remove wp-admin links to retrieve only return URLs not in the wp-admin
+         * directory.
+         *
+         * @since 2.6.0
+         *
+         * @return string
+         */
+        function wp_guess_url() {
+        if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+                $url = WP_SITEURL;
+        } else {
+                $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+                $url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+        }
+        return $url;
+}
+endif;  // Under WP2.6
 
 // Under WP2.7

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

@@ -357 +357 @@
 }
 
-function safe_site_url_filter($site_url){
-        global $xoops_config;
-        if (!$xoops_config->is_wpmu){
-                if ($site_url != get_xpress_url()) $site_url = get_xpress_url();
-        }
-        return $site_url;
-}
-
 function get_block_file_path($mydirname,$file_name)
 {