diff options
| -rw-r--r-- | app/admin.png | bin | 8449 -> 2852 bytes | |||
| -rw-r--r-- | app/bugreport.png | bin | 5394 -> 4478 bytes | |||
| -rw-r--r-- | app/chat.png | bin | 2194 -> 2544 bytes | |||
| -rw-r--r-- | app/directory.png | bin | 12024 -> 4895 bytes | |||
| -rw-r--r-- | app/events.png | bin | 11242 -> 4118 bytes | |||
| -rw-r--r-- | app/features.png | bin | 7152 -> 8542 bytes | |||
| -rw-r--r-- | app/help.png | bin | 6889 -> 6697 bytes | |||
| -rw-r--r-- | app/home.png | bin | 5172 -> 6347 bytes | |||
| -rw-r--r-- | app/invite.png | bin | 5166 -> 6227 bytes | |||
| -rw-r--r-- | app/lang.png | bin | 7556 -> 5163 bytes | |||
| -rw-r--r-- | app/mail.png | bin | 6623 -> 4875 bytes | |||
| -rw-r--r-- | app/manage.png | bin | 9585 -> 7355 bytes | |||
| -rw-r--r-- | app/mood.png | bin | 5137 -> 6384 bytes | |||
| -rw-r--r-- | app/photos.png | bin | 13693 -> 4080 bytes | |||
| -rw-r--r-- | app/poke.png | bin | 14377 -> 2610 bytes | |||
| -rw-r--r-- | app/post.png | bin | 2850 -> 4394 bytes | |||
| -rw-r--r-- | app/probe.png | bin | 10625 -> 7584 bytes | |||
| -rw-r--r-- | app/search.png | bin | 8544 -> 8354 bytes | |||
| -rw-r--r-- | app/settings.png | bin | 7626 -> 7958 bytes | |||
| -rw-r--r-- | app/storage.png | bin | 5191 -> 3194 bytes | |||
| -rw-r--r-- | app/suggest.png | bin | 2164 -> 7225 bytes | |||
| -rw-r--r-- | app/webpages.png | bin | 8678 -> 9092 bytes | |||
| -rw-r--r-- | mod/photos.php | 3 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 3 |
24 files changed, 1 insertions, 5 deletions
diff --git a/app/admin.png b/app/admin.png Binary files differindex f1954e52a..cde922e8e 100644 --- a/app/admin.png +++ b/app/admin.png diff --git a/app/bugreport.png b/app/bugreport.png Binary files differindex 64b6b7e9f..4b59da185 100644 --- a/app/bugreport.png +++ b/app/bugreport.png diff --git a/app/chat.png b/app/chat.png Binary files differindex aa03c75dd..9d3fdebd7 100644 --- a/app/chat.png +++ b/app/chat.png diff --git a/app/directory.png b/app/directory.png Binary files differindex 2df872d94..659f69051 100644 --- a/app/directory.png +++ b/app/directory.png diff --git a/app/events.png b/app/events.png Binary files differindex 411ee51f9..a5670fd1e 100644 --- a/app/events.png +++ b/app/events.png diff --git a/app/features.png b/app/features.png Binary files differindex cdccd19f7..5faf14bc3 100644 --- a/app/features.png +++ b/app/features.png diff --git a/app/help.png b/app/help.png Binary files differindex e1348231c..6b9b1ccb6 100644 --- a/app/help.png +++ b/app/help.png diff --git a/app/home.png b/app/home.png Binary files differindex 3f1b864fc..4b45f2a7a 100644 --- a/app/home.png +++ b/app/home.png diff --git a/app/invite.png b/app/invite.png Binary files differindex 1cd9ce254..dbc2cbbfa 100644 --- a/app/invite.png +++ b/app/invite.png diff --git a/app/lang.png b/app/lang.png Binary files differindex 4c0b9aad1..debffd1ae 100644 --- a/app/lang.png +++ b/app/lang.png diff --git a/app/mail.png b/app/mail.png Binary files differindex 74fbdb03e..bbd9f8449 100644 --- a/app/mail.png +++ b/app/mail.png diff --git a/app/manage.png b/app/manage.png Binary files differindex 4c4d13162..38a4dcbae 100644 --- a/app/manage.png +++ b/app/manage.png diff --git a/app/mood.png b/app/mood.png Binary files differindex 7df642b96..2a5c1aca6 100644 --- a/app/mood.png +++ b/app/mood.png diff --git a/app/photos.png b/app/photos.png Binary files differindex b4b2c519e..59b038288 100644 --- a/app/photos.png +++ b/app/photos.png diff --git a/app/poke.png b/app/poke.png Binary files differindex 1d264dd1b..9655d54ff 100644 --- a/app/poke.png +++ b/app/poke.png diff --git a/app/post.png b/app/post.png Binary files differindex 11d48e271..4a4355581 100644 --- a/app/post.png +++ b/app/post.png diff --git a/app/probe.png b/app/probe.png Binary files differindex 71a954bf8..21bd85cd9 100644 --- a/app/probe.png +++ b/app/probe.png diff --git a/app/search.png b/app/search.png Binary files differindex e483280ec..505d93c3f 100644 --- a/app/search.png +++ b/app/search.png diff --git a/app/settings.png b/app/settings.png Binary files differindex ff5d8e5d2..2ba11a79a 100644 --- a/app/settings.png +++ b/app/settings.png diff --git a/app/storage.png b/app/storage.png Binary files differindex c1f2df801..ad8b89f6a 100644 --- a/app/storage.png +++ b/app/storage.png diff --git a/app/suggest.png b/app/suggest.png Binary files differindex 6868da30f..ca9180528 100644 --- a/app/suggest.png +++ b/app/suggest.png diff --git a/app/webpages.png b/app/webpages.png Binary files differindex 460117bae..72a091831 100644 --- a/app/webpages.png +++ b/app/webpages.png diff --git a/mod/photos.php b/mod/photos.php index 7a9229cc4..f4e770ec0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -697,13 +697,10 @@ function photos_content(&$a) { $imagelink = ($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/image/' . $rr['resource_id'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); - $rel=("photo"); - $photos[] = array( 'id' => $rr['id'], 'twist' => ' ' . $twist . rand(2,4), 'link' => $imagelink, - 'rel' => $rel, 'title' => t('View Photo'), 'src' => $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] . '.' .$ext, 'alt' => $imgalt_e, diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index ba71bb2f5..7c3145769 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -7,7 +7,6 @@ function mysearch(term, callback, backend_url) { var postdata = { start:0, count:100, - //search:term.substring(1), search:term, type:'c', } @@ -40,7 +39,7 @@ function replace(item) { // Autocomplete contacts contacts = { - match: /(^|\s)(@!?)(\w{2,})$/, + match: /(^|\s)(@\!*)([^ \n]+)$/, index: 3, search: function(term, callback) { mysearch(term, callback, backend_url); }, replace: replace, |
