From 5996a28e19d37044d1b74b104f3a9b1c2d277008 Mon Sep 17 00:00:00 2001 From: Daniel Hromada Date: Wed, 26 Jan 2011 23:19:43 +0100 Subject: [PATCH] gettin rid of one nonaesthetic warning message & making possible to use base36 template_ids --- wwwroot/nodes.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php index cffb9d0..0c38023 100644 --- a/wwwroot/nodes.php +++ b/wwwroot/nodes.php @@ -42,13 +42,13 @@ $db = new CLASS_DATABASE(); if (preg_match('/id\/([0-9]+)(?:\/([0-9]+)\/?)?/',$_SERVER['PATH_INFO'],$match)) { // print_r($match); $_GET['node_id']=$match[1]; - if ($match[2]) { + if (!empty($match[2])) { $_GET['template_id']=$match[2]; } -} elseif (preg_match('/k\/([a-z0-9]+)(?:\/([0-9]+))?/',$_SERVER['PATH_INFO'],$match)) { +} elseif (preg_match('/k\/([a-z0-9]{1,7})(?:\/([a-z0-9]{1,7}))?/',$_SERVER['PATH_INFO'],$match)) { $_GET['node_id']=base_convert($match[1], 36, 10); - if ($match[2]) { - $_GET['template_id']=$match[2]; + if (!empty($match[2])) { + $_GET['template_id']=base_convert($match[2],36,10); } } elseif (preg_match('/name\/(.*?)\/?$/',$_SERVER['PATH_INFO'],$match)) { $_GET['node_id'] = nodes::getNodeIdByName($match[1]); -- 2.30.2