aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-07 06:29:32 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-07 06:29:32 -0700
commitdea552b74f5146f8b36a23fd2074de055ab960cb (patch)
tree9cec10ff1e8b251e8f26e9aa109a5c6d624b0275
parentc10e7723185c608217d0944fe62a36995e552322 (diff)
downloadvolse-hubzilla-dea552b74f5146f8b36a23fd2074de055ab960cb.tar.gz
volse-hubzilla-dea552b74f5146f8b36a23fd2074de055ab960cb.tar.bz2
volse-hubzilla-dea552b74f5146f8b36a23fd2074de055ab960cb.zip
some fixes after cloning to a new site
-rw-r--r--mod/item.php4
-rw-r--r--mod/profile_photo.php14
-rw-r--r--mod/profiles.php2
-rw-r--r--view/profile_edit.tpl2
-rw-r--r--view/sidenote.tpl1
5 files changed, 17 insertions, 6 deletions
diff --git a/mod/item.php b/mod/item.php
index 1c1fd5029..2b03ecaa2 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -58,10 +58,10 @@ function item_post(&$a) {
intval($post_id));
}
- require('notifier.php');
+// require('notifier.php');
- notifier(&$a,$post_id,$parent);
+// notifier($a,$post_id,$parent);
}
goaway($a->get_baseurl() . "/profile/$profile_uid");
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index f7e6825ae..8b536c2aa 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -88,9 +88,19 @@ function profile_photo_post(&$a) {
$r = q("UPDATE `profile` SET `photo` = '%s', `thumb` = '%s' WHERE `id` = %d LIMIT 1",
dbesc($a->get_baseurl() . '/photo/' . $image_id . '-4.jpg'),
dbesc($a->get_baseurl() . '/photo/' . $image_id . '-5.jpg'),
- intval($profile_id));
- if($r === NULL)
+ intval($profile_id)
+ );
+ if($r === false)
$_SESSION['sysmsg'] .= "Failed to add image to profile." . EOL;
+// We should really only do this if requested, or if it is the default profile. The contact
+//table images are used in coversations.
+ $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s' WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+ dbesc($a->get_baseurl() . '/photo/' . $image_id . '-4.jpg'),
+ dbesc($a->get_baseurl() . '/photo/' . $image_id . '-5.jpg'),
+ intval($_SESSION['uid'])
+ );
+ if($r ===false)
+ notice("Failed to add photo to contact table." .EOL );
}
goaway($a->get_baseurl() . '/profiles');
diff --git a/mod/profiles.php b/mod/profiles.php
index cba358a67..a8b6858d7 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -138,7 +138,7 @@ function profiles_content(&$a) {
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
- $a->page['aside'] = file_get_contents('view/sidenote.tpl');
+// $a->page['aside'] = file_get_contents('view/sidenote.tpl');
$is_default = (($r[0]['is-default']) ? 1 : 0);
$tpl = file_get_contents("view/profile_edit.tpl");
$o .= replace_macros($tpl,array(
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index 25fc6fd4e..d895a6b48 100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -18,7 +18,7 @@ $default
<div id="profile-edit-name-end"></div>
<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="profile-edit-" >Your Gender: </label>
+<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
$gender
</div>
<div id="profile-edit-gender-end"></div>
diff --git a/view/sidenote.tpl b/view/sidenote.tpl
index dbc120cc0..44d34bf2a 100644
--- a/view/sidenote.tpl
+++ b/view/sidenote.tpl
@@ -14,4 +14,5 @@ Write something
</div>
<div id="sidenote-end"></div>
+</form>
</div>