aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-15 14:42:08 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-15 14:42:08 +0000
commit030c68e934e467ec8b3ae35f099af26d0e561c07 (patch)
tree8ba0afc4c3dfc27a666470eea9c9949a213e1d6d /engine
parentbdb0ef6d84f781ea3e85a6670efc20b6adadb6bc (diff)
downloadelgg-030c68e934e467ec8b3ae35f099af26d0e561c07.tar.gz
elgg-030c68e934e467ec8b3ae35f099af26d0e561c07.tar.bz2
Removing the multiple slash problem on metastrings in extenders
git-svn-id: https://code.elgg.org/elgg/trunk@458 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/annotations.php4
-rw-r--r--engine/lib/extender.php2
-rw-r--r--engine/lib/metastrings.php4
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 93727a283..e76254acb 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -158,8 +158,8 @@
global $CONFIG;
$entity_guid = (int)$entity_guid;
- $name = sanitise_string(trim($name));
- $value = sanitise_string(trim($value));
+ //$name = sanitise_string(trim($name));
+ //$value = sanitise_string(trim($value));
$value_type = detect_extender_valuetype($value, sanitise_string(trim($value_type)));
$owner_guid = (int)$owner_guid;
diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index d3963d781..05a86a62e 100644
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -43,7 +43,7 @@
case 'integer' : return (int)$this->attributes['value'];
//case 'tag' :
//case 'file' :
- case 'text' : return sanitise_string($this->attributes['value']);
+ case 'text' : return ($this->attributes['value']);
default : throw new InstallationException("Type {$this->attributes['value_type']} is not supported. This indicates an error in your installation, most likely caused by an incomplete upgrade.");
}
diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
index 45ad8acda..aaa199e03 100644
--- a/engine/lib/metastrings.php
+++ b/engine/lib/metastrings.php
@@ -41,12 +41,12 @@
{
global $CONFIG;
- $string = sanitise_string($string);
+ $sanstring = sanitise_string($string);
$id = get_metastring_id($string);
if ($id) return $id;
- return insert_data("INSERT into {$CONFIG->dbprefix}metastrings (string) values ('$string')");
+ return insert_data("INSERT into {$CONFIG->dbprefix}metastrings (string) values ('$sanstring')");
}
?> \ No newline at end of file