diff options
| author | friendica <info@friendica.com> | 2012-08-01 05:02:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-08-01 05:02:43 -0700 |
| commit | dcbc0c0c9516adf616023615871439b4015fa686 (patch) | |
| tree | 451f1e7f53e9635a2640bef66c4541d1dd4b6c10 /include/text.php | |
| parent | 7a0894287268658361c90e2f4d1b77f8ca5739a6 (diff) | |
| download | volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.tar.gz volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.tar.bz2 volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.zip | |
major theme re-org, only duepuntozero and slackr working atm
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index 3e4817898..c7030ad7b 100644 --- a/include/text.php +++ b/include/text.php @@ -430,10 +430,16 @@ function get_markup_template($s) { $a=get_app(); $theme = current_theme(); - if(file_exists("view/theme/$theme/$s")) + if(file_exists("view/theme/$theme/tpl/$s")) + return file_get_contents("view/theme/$theme/tpl/$s"); + elseif(file_exists("view/theme/$theme/$s")) return file_get_contents("view/theme/$theme/$s"); + elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/tpl/$s")) + return file_get_contents("view/theme/".$a->theme_info["extends"]."/tpl/$s"); elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/$s")) return file_get_contents("view/theme/".$a->theme_info["extends"]."/$s"); + elseif(file_exists("view/tpl/$s")) + return file_get_contents("view/tpl/$s"); else return file_get_contents("view/$s"); @@ -1633,7 +1639,7 @@ function undo_post_tagging($s) { function fix_mce_lf($s) { $s = str_replace("\r\n","\n",$s); - $s = str_replace("\n\n","\n",$s); +// $s = str_replace("\n\n","\n",$s); return $s; } |