GIT.Harvie.CZ
/
mirrors
/
Kyberia-bloodline.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1552688
)
gettin rid of one nonaesthetic warning message & making possible to use base36 templa...
author
Daniel Hromada
<hromi@Aphrodité.(none)>
Wed, 26 Jan 2011 22:19:43 +0000
(23:19 +0100)
committer
Daniel Hromada
<hromi@Aphrodité.(none)>
Wed, 26 Jan 2011 22:19:43 +0000
(23:19 +0100)
wwwroot/nodes.php
patch
|
blob
|
blame
|
history
diff --git
a/wwwroot/nodes.php
b/wwwroot/nodes.php
index cffb9d09e9e9bafceaeb3387729a9d0b349f8bc3..0c3802391a7203cac09aa775a22646d43a61c2c6 100644
(file)
--- 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 (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];
}
$_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);
$_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]);
}
} elseif (preg_match('/name\/(.*?)\/?$/',$_SERVER['PATH_INFO'],$match)) {
$_GET['node_id'] = nodes::getNodeIdByName($match[1]);
This page took
0.142543 seconds
and
4
git commands to generate.