Merge branch 'next'

1 files changed, 13 insertions, 2 deletions

diff --git a/src/journal.cc b/src/journal.cc
index e6c09125..c4c8fd98 100644
--- a/src/journal.cc
+++ b/src/journal.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2012, John Wiegley.  All rights reserved.
+ * Copyright (c) 2003-2013, John Wiegley.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -127,8 +127,19 @@ account_t * journal_t::register_account(const string& name, post_t * post,
   // object.
   if (account_aliases.size() > 0) {
     accounts_map::const_iterator i = account_aliases.find(name);
-    if (i != account_aliases.end())
+    if (i != account_aliases.end()) {
       result = (*i).second;
+    } else {
+      // only check the very first account for alias expansion, in case
+      // that can be expanded successfully
+      size_t colon = name.find(':');
+      if(colon != string::npos) {
+        accounts_map::const_iterator i = account_aliases.find(name.substr(0, colon));
+        if (i != account_aliases.end()) {
+          result = find_account((*i).second->fullname() + name.substr(colon));
+        }
+      }
+    }
   }
 
   // Create the account object and associate it with the journal; this