diff options
| author | friendica <info@friendica.com> | 2014-09-06 00:37:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-06 00:37:43 -0700 |
| commit | 8c63bb40a79dc99b2ae1b2d73b716594e741502b (patch) | |
| tree | cb4f81789770f4b3f332b0892ccf7a203dc6f859 | |
| parent | 28b75b028dcb1633a9407a5a5c79e5d2423e18a5 (diff) | |
| parent | d439bf51378a7a44db629a4ac05f2fa771a3d335 (diff) | |
| download | volse-hubzilla-8c63bb40a79dc99b2ae1b2d73b716594e741502b.tar.gz volse-hubzilla-8c63bb40a79dc99b2ae1b2d73b716594e741502b.tar.bz2 volse-hubzilla-8c63bb40a79dc99b2ae1b2d73b716594e741502b.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | app/bugreport.apd | 4 | ||||
| -rw-r--r-- | app/bugreport.png | bin | 0 -> 5394 bytes | |||
| -rw-r--r-- | mod/directory.php | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/bugreport.apd b/app/bugreport.apd new file mode 100644 index 000000000..412ef62b8 --- /dev/null +++ b/app/bugreport.apd @@ -0,0 +1,4 @@ +url: https://github.com/friendica/red/issues +requires: local_user +name: Bug Report +photo: $baseurl/app/bugreport.png diff --git a/app/bugreport.png b/app/bugreport.png Binary files differnew file mode 100644 index 000000000..64b6b7e9f --- /dev/null +++ b/app/bugreport.png diff --git a/mod/directory.php b/mod/directory.php index 2c11e3247..c2a71b680 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -224,10 +224,11 @@ function directory_content(&$a) { '$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'), '$entries' => $entries, '$dirlbl' => t('Directory'), - '$submit' => t('Find') + '$submit' => t('Find'), + '$next' => alt_pager($a,$j['records'], t('next page'), t('previous page')) + )); -// $o .= alt_pager($a,$j['records'], t('next page'), t('previous page')); } |
