*
* @category Settings
* @package StatusNet
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @author Zach Copley <zach@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@status.net>
+ * @author Zach Copley <zach@status.net>
* @copyright 2008-2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
*
* @category Settings
* @package StatusNet
- * @author Zach Copley <zach@controlyourself.ca>
- * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @author Zach Copley <zach@status.net>
+ * @author Sarven Capadisli <csarven@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
function getWorkingDesign()
{
-
$user = common_current_user();
$design = $user->getDesign();
-
- if (empty($design)) {
- $design = $this->defaultDesign();
- }
-
return $design;
}
function showContent()
{
- $this->showDesignForm($this->getWorkingDesign());
+ $design = $this->getWorkingDesign();
+
+ if (empty($design)) {
+ $design = Design::siteDesign();
+ }
+
+ $this->showDesignForm($design);
}
/**
if (empty($id)) {
common_log_db_error($id, 'INSERT', __FILE__);
- $this->showForm(_('Unable to save your design settings!'));
+ $this->showForm(_('Unable to save your design settings.'));
return;
}
if (empty($result)) {
common_log_db_error($original, 'UPDATE', __FILE__);
- $this->showForm(_('Unable to save your design settings!'));
+ $this->showForm(_('Unable to save your design settings.'));
$user->query('ROLLBACK');
return;
}
if (empty($id)) {
common_log_db_error($id, 'INSERT', __FILE__);
- $this->showForm(_('Unable to save your design settings!'));
+ $this->showForm(_('Unable to save your design settings.'));
return;
}
if (empty($result)) {
common_log_db_error($original, 'UPDATE', __FILE__);
- $this->showForm(_('Unable to save your design settings!'));
+ $this->showForm(_('Unable to save your design settings.'));
$user->query('ROLLBACK');
return;
}