diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-02 16:53:47 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-02 16:53:47 -0400 |
| commit | 9cb3fc226a9246b36810338f0ee8a115738cc97b (patch) | |
| tree | cfc4babf70100eda5a62a23c9a31b5666466c6c3 /include | |
| parent | 5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (diff) | |
| parent | 6dfd55668f39d2cfb27d468cc982471abaad5165 (diff) | |
| download | volse-hubzilla-9cb3fc226a9246b36810338f0ee8a115738cc97b.tar.gz volse-hubzilla-9cb3fc226a9246b36810338f0ee8a115738cc97b.tar.bz2 volse-hubzilla-9cb3fc226a9246b36810338f0ee8a115738cc97b.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: css-fixes
diabook-themes: fixes in js
diabook-themes: fixed pageheader
diabook-themes: bugfixes / css-fixes
make the "new calendar" (javascript interactive) the default
remove zrl from query string
catch a couple more Oo smilies
add page_content_top hook
* master:
Diffstat (limited to 'include')
| -rw-r--r-- | include/text.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php index f204e3f9b..5456b5ad3 100644 --- a/include/text.php +++ b/include/text.php @@ -225,6 +225,9 @@ if(! function_exists('paginate')) { function paginate(&$a) { $o = ''; $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); + +// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped); + $stripped = str_replace('q=','',$stripped); $stripped = trim($stripped,'/'); $pagenum = $a->pager['page']; @@ -725,6 +728,8 @@ function smilies($s, $sample = false) { '\\o/', 'o.O', 'O.o', + 'o_O', + 'O_o', ":'(", ":-!", ":-/", @@ -759,6 +764,8 @@ function smilies($s, $sample = false) { '<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />', '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />', '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />', '<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />', '<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />', '<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />', |