aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/bookmarks.php4
-rw-r--r--mod/item.php2
-rw-r--r--mod/profiles.php1
-rw-r--r--mod/webpages.php6
4 files changed, 9 insertions, 4 deletions
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index 9ccc171fe..6b2476a8e 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -55,6 +55,8 @@ function bookmarks_content(&$a) {
$o = profile_tabs($a,true,$channel['channel_address']);
+ $o .= '<div class="generic-content-wrapper-styled">';
+
$o .= '<h3>' . t('My Bookmarks') . '</h3>';
$x = menu_list(local_user(),'',MENU_BOOKMARK);
@@ -78,7 +80,7 @@ function bookmarks_content(&$a) {
}
}
-
+ $o .= '</div>';
return $o;
diff --git a/mod/item.php b/mod/item.php
index 2364e6abf..ac15e50e8 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -979,7 +979,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
}
}
// if the tag is already replaced...
- elseif(strpos($tag,'[zrl=')) {
+ elseif((strpos($tag,'[zrl=')) || (strpos($tag,'[url='))) {
//...do nothing
return $replaced;
}
diff --git a/mod/profiles.php b/mod/profiles.php
index 063e714e7..5d0416e9a 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -766,6 +766,7 @@ logger('extra_fields: ' . print_r($extra_fields,true));
: '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
));
}
+
}
return $o;
}
diff --git a/mod/webpages.php b/mod/webpages.php
index efaf3c4bf..2c3cc36ea 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -81,6 +81,8 @@ function webpages_content(&$a) {
require_once('include/conversation.php');
$o = profile_tabs($a,true);
+ $o .= '<div class="generic-content-wrapper-styled">';
+
$o .= '<h2>' . t('Webpages') . '</h2>';
$x = array(
@@ -95,7 +97,7 @@ function webpages_content(&$a) {
'mimetype' => $mimetype,
'layout' => $layout,
);
-
+
if($_REQUEST['title'])
$x['title'] = $_REQUEST['title'];
if($_REQUEST['body'])
@@ -105,7 +107,6 @@ function webpages_content(&$a) {
$o .= status_editor($a,$x);
-
// Get a list of webpages. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
//TODO - this should be replaced with pagelist_widget
@@ -142,5 +143,6 @@ function webpages_content(&$a) {
));
+ $o .= '</div>';
}