some fixes after cloning to a new site

diff --git a/mod/item.php b/mod/item.php
index 1c1fd502946e6e93d1c0ed33f13d90f39526046c..2b03ecaa2f8c28bd9f6d88e563dca68df6c79938 100644 (file)
--- 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 f7e6825ae7d2625d25756b9a358896a932d1e6da..8b536c2aa9a80b6974b6413322dbaa4563da9cff 100644 (file)
--- 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 cba358a67fbb78dcfda44244ea37640aead09277..a8b6858d798c125eedb0a1cc543c4275ccbc1395 100644 (file)
--- 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 25fc6fd4e4c34bc152c4c00daa8f1c2c097d39b4..d895a6b4822badf367f9bcf0e9cab937f25208b5 100644 (file)
--- 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 dbc120cc009e3af79e47a46164ad9b263d70cee0..44d34bf2a2d16ded77588a1cade4e835a31f7452 100644 (file)
--- a/view/sidenote.tpl
+++ b/view/sidenote.tpl
@@ -14,4 +14,5 @@ Write something
 
 </div>
 <div id="sidenote-end"></div>
+</form>
 </div>