harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comanche: move 'webpage' declaration to the first parser pass so it is set when content loads.

Browse Source
This commit is contained in:
friendica 2015-03-25 15:32:49 -07:00
parent 022305fe83
commit e33da588bd
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/comanche.php
View File

@ -79,6 +79,14 @@ function comanche_parser(&$a, $s, $pass = 0) {
if($cnt)
$a->layout['theme'] = trim($matches[1]);
$cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER);
if($cnt) {
// only the last webpage definition is used if there is more than one
foreach($matches as $mtch) {
$a->layout['webpage'] = comanche_webpage($a,$mtch[1]);
}
}
}
else {
$cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER);
@ -88,13 +96,6 @@ function comanche_parser(&$a, $s, $pass = 0) {
}
}
$cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER);
if($cnt) {
// only the last webpage definition is used if there is more than one
foreach($matches as $mtch) {
$a->layout['webpage'] = comanche_webpage($a,$mtch[1]);
}
}
}
}

4
include/text.php
View File

@ -1309,13 +1309,13 @@ function generate_map($coord) {
$coord = str_replace(array(',','/',' '),array(' ',' ',' '),$coord);
$arr = array('lat' => trim(substr($coord,0,strpos($coord,' '))), 'lon' => trim(substr($coord,strpos($coord,' ')+1)), 'html' => '');
call_hooks('generate_map',$arr);
return $arr['html'];
return (($arr['html']) ? $arr['html'] : $coord);
}
function generate_named_map($location) {
$arr = array('location' => $location, 'html' => '');
call_hooks('generate_named_map',$arr);
return $arr['html'];
return (($arr['html']) ? $arr['html'] : $location);
}

2
version.inc
View File

@ -1 +1 @@
2015-03-24.981
2015-03-25.982