Merge pull request #2004 from opencart-russia/master

Update seo_url.php fix for another route
opencart · Oct 15, 2014 · 68d56e8 · 68d56e8
2 parents 7b0a0e0 + 6e18ce5
commit 68d56e8
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/upload/catalog/controller/common/seo_url.php b/upload/catalog/controller/common/seo_url.php
@@ -40,6 +40,11 @@ public function index() {
 					if ($url[0] == 'information_id') {
 						$this->request->get['information_id'] = $url[1];
 					}
+
+					if ($query->row['query'] && $url[0] != 'information_id' && $url[0] != 'manufacturer_id'  && $url[0] != 'category_id' && $url[0] != 'product_id') {
+						$this->request->get['route'] = $query->row['query'];
+					}
+
 				} else {
 					$this->request->get['route'] = 'error/not_found';
 
@@ -100,8 +105,14 @@ public function rewrite($link) {
 					}
 
 					unset($data[$key]);
-				} elseif ($key == 'route' && $value == 'common/home') {
-					$url = '/';
+				} else  {
+					$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "url_alias WHERE `query` = '" .$data['route'] . "'");
+
+					if ($query->num_rows) {
+						$url .= '/' . $query->row['keyword'];
+
+						unset($data[$key]);
+					}
 				}
 			}
 		}