Changeset 11954

Timestamp:

Jun 18, 2009, 5:37:36 PM (14 years ago)

Author:

nagasawa

Message:

#3748:携帯版URLの自動リンクの対応の取り消し(2.12.x)

File:

• OpenPNE/branches/stable-2.12.x/webapp/lib/smarty_plugins/modifier.t_url2a_ktai.php (modified) (2 diffs)

OpenPNE/branches/stable-2.12.x/webapp/lib/smarty_plugins/modifier.t_url2a_ktai.php

@@ -32 +32 @@
     }
 
-    $url_pattern = sprintf('/^%s(?:index.php)?\?m=(pc|ktai)&a=(\w+)((?:[a-zA-Z0-9_=]|&)*)$/', preg_quote($openpne_url, '/'));
+    $url_pattern = sprintf('/^%s(?:index.php)?\?m=pc&a=(\w+)((?:[a-zA-Z0-9_=]|&)*)$/', preg_quote($openpne_url, '/'));
 
     $openpne_url_matches = array();
@@ -38 +38 @@
         return $raw_url;
     }
-    $module = $openpne_url_matches[1];
-    $action = $openpne_url_matches[2];
-    $param = $openpne_url_matches[3];
+    $action = $openpne_url_matches[1];
+    $param = $openpne_url_matches[2];
 
-    if ($module === 'pc') {
-        // 自動リンクのアクションリストにない場合は変換なし
-        if (empty($GLOBALS['_OPENPNE_PC2KTAI_LINK_ACTION_LIST'][$action])) {
-            return $raw_url;
-        }
-        $converted_action = $GLOBALS['_OPENPNE_PC2KTAI_LINK_ACTION_LIST'][$action];
-    } else {
-        $converted_action = $action;
-        // ksidを取り払う
-        $ksid_pos = strpos($param, 'ksid=');
-        if ($ksid_pos !== false) {
-            $ksid_pos_end = strpos($param, '&', $ksid_pos);
-            if ($ksid_pos_end === false) {
-                $ksid_pos -= 5;
-                $ksid_pos_end = strlen($param);
-            } else {
-              $ksid_pos_end += 5;
-            }
-            $param = substr($param, 0, $ksid_pos) . substr($param, $ksid_pos_end, strlen($param) - $ksid_pos_end);
-        }
+    //自動リンクのアクションリストにない場合は変換なし
+    if (empty($GLOBALS['_OPENPNE_PC2KTAI_LINK_ACTION_LIST'][$action])) {
+        return $raw_url;
     }
+
+    $converted_action = $GLOBALS['_OPENPNE_PC2KTAI_LINK_ACTION_LIST'][$action];
     $param = str_replace('&', '&', $param);