aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-03 20:37:39 -0700
committerfriendica <info@friendica.com>2013-07-03 20:37:39 -0700
commitfbdee83dca4aa9e5d66488f32121d8c62e378316 (patch)
treec86139c1ea524170e67cc41bb6077e3da5689a75
parent8ec5f8b07a0f1d5ad266bfdfdfb48d4f5647eed6 (diff)
downloadvolse-hubzilla-fbdee83dca4aa9e5d66488f32121d8c62e378316.tar.gz
volse-hubzilla-fbdee83dca4aa9e5d66488f32121d8c62e378316.tar.bz2
volse-hubzilla-fbdee83dca4aa9e5d66488f32121d8c62e378316.zip
some object/thing tweaks
-rwxr-xr-xboot.php2
-rw-r--r--include/taxonomy.php10
-rwxr-xr-xindex.php7
-rw-r--r--mod/thing.php14
4 files changed, 30 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index b15f20d12..bf99c142e 100755
--- a/boot.php
+++ b/boot.php
@@ -1930,7 +1930,7 @@ function current_theme(){
function current_theme_url($installing = false) {
global $a;
$t = current_theme();
- if((file_exists('view/theme/' . $t . '/php/style.php')) && (! $installing))
+ if(file_exists('view/theme/' . $t . '/php/style.php'))
return('view/theme/' . $t . '/php/style.pcss');
return('view/theme/' . $t . '/css/style.css');
}
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 1ccb18b47..70c2ad3e0 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -173,6 +173,15 @@ function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$type = TERM_HA
}
+ /**
+ * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants"
+ * We use the first person form when creating an activity, but the third person for use in activities
+ * FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually
+ * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module.
+ */
+
+
+
function obj_verbs() {
$verbs = array(
'has' => array( t('have'), t('has')),
@@ -186,3 +195,4 @@ function obj_verbs() {
return $arr['verbs'];
}
+
diff --git a/index.php b/index.php
index 08943e4b7..14b8ca856 100755
--- a/index.php
+++ b/index.php
@@ -118,8 +118,11 @@ if(! x($_SESSION,'sysmsg_info'))
*/
-if($install)
- $a->module = 'setup';
+if($install) {
+ /* Allow an exception for the view module so that pcss will be interpreted during installation */
+ if($a->module != 'view')
+ $a->module = 'setup';
+}
else
check_config($a);
diff --git a/mod/thing.php b/mod/thing.php
index 9cd0f519f..8ecf00d01 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -31,6 +31,20 @@ function thing_init(&$a) {
*/
$translated_verb = $verbs[$verb][1];
+
+ /**
+ * The site administrator can do things that normals cannot.
+ * This is restricted because it will likely cause
+ * an activitystreams protocol violation and the activity might
+ * choke in some other network and result in unnecessary
+ * support requests. It isn't because we're trying to be heavy-handed
+ * about what you can and can't do.
+ */
+
+ if(! $translated_verb) {
+ if(is_site_admin())
+ $translated_verb = $verb;
+ }
/**
* Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators