Merge pull request #106 from s-nakajima/master

frame_idが空値の場合、リンク先URLからframe_idを削除する
NetCommons3 · Jan 11, 2018 · e0d46f2 · e0d46f2
2 parents eebebbf + de50198
commit e0d46f2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Model/Topic.php b/Model/Topic.php
@@ -434,9 +434,15 @@ public function beforeValidate($options = array()) {
 	public function afterFind($results, $primary = false) {
 		foreach ($results as $key => $value) {
 			if (isset($results[$key][$this->alias]['path'])) {
-				$url = Router::url(
-					$value[$this->alias]['path'] . '?frame_id=' . $value[$this->alias]['frame_id'], true
-				);
+				if ($value[$this->alias]['frame_id']) {
+					$url = Router::url(
+						$value[$this->alias]['path'] . '?frame_id=' . $value[$this->alias]['frame_id'], true
+					);
+				} else {
+					$url = Router::url(
+						$value[$this->alias]['path'], true
+					);
+				}
 				$results[$key][$this->alias]['url'] = $url;
 			}
 		}