status update fix

voitto · Sep 6, 2009 · b46a09c · b46a09c
1 parent 365c2e0
commit b46a09c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -51,6 +51,8 @@ env:
   email_user: 
   email_pass: 
 
+  showemail: false
+
   threaded: false
 
   pretty_urls: false
@@ -81,6 +83,7 @@ env:
     - translate
     - facebook
     - pages
+    - shortener
 
   installed:
     - password
@@ -90,6 +93,7 @@ env:
     - translate
     - facebook
     - pages
+    - shortener
 
   boot: omb
 

diff --git a/app/omb/plugins/omb.php b/app/omb/plugins/omb.php
@@ -367,9 +367,15 @@ function wp_set_post_fields_after( &$model, &$rec ) {
     $rec->set_value( 'uri', $request->url_for( array(
       'resource'=>'__'.$rec->id,
     )));
+    $rec->set_value( 'url', $request->url_for( array(
+      'resource'=>'__'.$rec->id,
+    )));
     if (isset($_POST['parent_id']) && is_numeric($_POST['parent_id']) && is_ajax()) {
       $rec->set_value( 'parent_id',$_POST['parent_id']);
       $rec->set_value( 'local',1);
+    } else {
+      $rec->set_value( 'parent_id',0);
+      $rec->set_value( 'local',0);
     }
     $rec->save_changes();
   }

diff --git a/db/boot.php b/db/boot.php
@@ -422,10 +422,12 @@
   $sql .= " AND password LIKE '".$db->escape_string($params['password'])."'";
   $result = $db->get_result( $sql );
   if ( $db->num_rows($result) == 1 ) {
+    if ($pretty_url_base && !mu_url() && !('http://'.$subdomain.".".$rest == $pretty_url_base)) {
+      $request->base = 'http://'.$subdomain.".".$rest;
+      $request->domain = $subdomain.".".$rest;
+      $pretty_url_base = $request->base;
+    }
     $stream = $db->result_value( $result, 0, "nickname" );
-    $request->base = 'http://'.$stream.".".$rest;
-    $request->domain = $stream.".".$rest;
-    $pretty_url_base = $request->base;
     global $db,$request;
     global $person_id;
     global $api_methods,$api_method_perms;