diff options
author | friendica <info@friendica.com> | 2014-06-10 22:35:15 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-06-10 22:35:15 -0700 |
commit | 3dfcfbf85cbbdc93b19549faed56e2dc593175d7 (patch) | |
tree | 06d6ed98eaf81259f2e723231e51f73528658b35 | |
parent | 13ba9ef0037656b1e12d627f767fc2fc8781632a (diff) | |
download | volse-hubzilla-3dfcfbf85cbbdc93b19549faed56e2dc593175d7.tar.gz volse-hubzilla-3dfcfbf85cbbdc93b19549faed56e2dc593175d7.tar.bz2 volse-hubzilla-3dfcfbf85cbbdc93b19549faed56e2dc593175d7.zip |
issue #433
-rw-r--r-- | include/apps.php | 2 | ||||
-rw-r--r-- | mod/apps.php | 2 | ||||
-rw-r--r-- | mod/display.php | 1 | ||||
-rw-r--r-- | mod/notify.php | 7 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/apps.php b/include/apps.php index df62ba774..bd5c50405 100644 --- a/include/apps.php +++ b/include/apps.php @@ -31,7 +31,7 @@ function get_system_apps() { } } } - usort($ret,'app_name_compare'); + return $ret; } diff --git a/mod/apps.php b/mod/apps.php index 5cbf67b1f..07d1968d2 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -23,7 +23,7 @@ function apps_content(&$a) { } usort($syslist,'app_name_compare'); - logger('apps: ' . print_r($syslist,true)); +// logger('apps: ' . print_r($syslist,true)); foreach($syslist as $app) { $apps[] = app_render($app,$mode); diff --git a/mod/display.php b/mod/display.php index 8eb271b9c..4c30ae554 100644 --- a/mod/display.php +++ b/mod/display.php @@ -166,6 +166,7 @@ function display_content(&$a, $update = 0, $load = false) { $updateable = true; } + } if($r === null) { diff --git a/mod/notify.php b/mod/notify.php index 6ee4260ce..72534c7fd 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -11,15 +11,14 @@ function notify_init(&$a) { intval(local_user()) ); if($r) { - q("update notify set seen = 1 where ( link = '%s' or ( parent != '' and parent = '%s' and otype = '%s' )) and uid = %d", - dbesc($r[0]['link']), - intval($r[0]['parent']), + q("update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d", + dbesc($r[0]['parent']), dbesc($r[0]['otype']), + dbesc($r[0]['link']), intval(local_user()) ); goaway($r[0]['link']); } - goaway($a->get_baseurl(true)); } |