slugify console.php prompt name

since PHP thought it was fun to crash on Quitter España and I
couldn't be bothered messing with readline

diff --git a/classes/Profile.php b/classes/Profile.php
index 6eb09782b18785574ce54f28585bae3e37480724..47e144032d2b04d061cf04867b94f5668450f6ec 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -880,6 +880,11 @@ class Profile extends Managed_DataObject
             $inst->delete();
         }
 
+        $localuser = User::getKV('id', $this->id);
+        if ($localuser instanceof User) {
+            $localuser->delete();
+        }
+
         return parent::delete($useWhere);
     }
 

diff --git a/scripts/console.php b/scripts/console.php
index c260ffaa0037cb41dc5942deae59589f5c8526b3..692cedf8d1e7396a267ea618cd1d89f7955d55c6 100755 (executable)
--- a/scripts/console.php
+++ b/scripts/console.php
@@ -113,7 +113,7 @@ function readline_emulation($prompt)
 
 function console_help()
 {
-    print "Welcome to StatusNet's interactive PHP console!\n";
+    print "Welcome to GNU social's interactive PHP console!\n";
     print "Type some PHP code and it'll execute...\n";
     print "\n";
     print "Hint: return a value of any type to output it via var_export():\n";
@@ -128,8 +128,8 @@ function console_help()
 }
 
 if (CONSOLE_INTERACTIVE) {
-    print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n";
-    $prompt = common_config('site', 'name') . '> ';
+    print "GNU social interactive PHP console... type ctrl+D or enter 'exit' to exit.\n";
+    $prompt = common_slugify(common_config('site', 'name')) . '> ';
 } else {
     $prompt = '';
 }