aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-12 18:49:42 -0800
committerfriendica <info@friendica.com>2015-02-12 18:49:42 -0800
commit084ca3f4a16084068a0ab04af651770142324f3a (patch)
tree056b9ef7c0b53af3cb152bd8e248e9e159bc0766
parentda2349bb6a85d13f0aa29046bef3021cf0c884ba (diff)
downloadvolse-hubzilla-084ca3f4a16084068a0ab04af651770142324f3a.tar.gz
volse-hubzilla-084ca3f4a16084068a0ab04af651770142324f3a.tar.bz2
volse-hubzilla-084ca3f4a16084068a0ab04af651770142324f3a.zip
typo
-rw-r--r--mod/item.php1
-rw-r--r--mod/network.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php
index 99d28400b..120b5c66f 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -529,6 +529,7 @@ function item_post(&$a) {
$body = preg_replace_callback('/\[\$b64url(.*?)\[\/(url)\]/ism','red_unescape_codeblock',$body);
$body = preg_replace_callback('/\[\$b64code(.*?)\[\/(code)\]/ism','red_unescape_codeblock',$body);
+
// fix any img tags that should be zmg
$body = preg_replace_callback('/\[img(.*?)\](.*?)\[\/img\]/ism','red_zrlify_img_callback',$body);
diff --git a/mod/network.php b/mod/network.php
index 236d4c5e0..944c3c1d1 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -346,7 +346,7 @@ function network_content(&$a, $update = 0, $load = false) {
else
$page_mode = 'client';
- $simple_update = (($update) ? " and item.unseen = 1 " : '');
+ $simple_update = (($update) ? " and item_unseen = 1 " : '');
// This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
// or three and look at your matrix page - after opening up your browser. The first page loads just as it