summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-25 22:23:48 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-01-25 22:23:48 +0100
commite6efa755c9a8c6a6a4cc0faaffc23aea049d8298 (patch)
tree7ba7b5b28244ab996ae51d1fb8fa2f745ce2b6ab /lib
parentb9bbb894f8b01e000bb5e3a8a82db7bebad3ea00 (diff)
downloadnextcloud-server-e6efa755c9a8c6a6a4cc0faaffc23aea049d8298.tar.gz
nextcloud-server-e6efa755c9a8c6a6a4cc0faaffc23aea049d8298.zip
Use short for of substr to not need strlen()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/DB/Adapter.php2
-rw-r--r--lib/private/DB/AdapterSqlite.php2
-rw-r--r--lib/private/legacy/template.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php
index 3123a1b0d53..e88e3cf09c6 100644
--- a/lib/private/DB/Adapter.php
+++ b/lib/private/DB/Adapter.php
@@ -108,7 +108,7 @@ class Adapter {
$query .= ' = ? AND ';
}
}
- $query = substr($query, 0, strlen($query) - 5);
+ $query = substr($query, 0, -5);
$query .= ' HAVING COUNT(*) = 0';
return $this->conn->executeUpdate($query, $inserts);
diff --git a/lib/private/DB/AdapterSqlite.php b/lib/private/DB/AdapterSqlite.php
index 5507699c54a..dbeec9ded43 100644
--- a/lib/private/DB/AdapterSqlite.php
+++ b/lib/private/DB/AdapterSqlite.php
@@ -79,7 +79,7 @@ class AdapterSqlite extends Adapter {
$query .= ' = ? AND ';
}
}
- $query = substr($query, 0, strlen($query) - 5);
+ $query = substr($query, 0, -5);
$query .= ')';
return $this->conn->executeUpdate($query, $inserts);
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index e3365ca455f..c5279bff6b8 100644
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -132,7 +132,7 @@ class OC_Template extends \OC\Template\Base {
foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
//remove trailing ".js" as addVendorScript will append it
OC_Util::addVendorScript(
- substr($vendorLibrary, 0, strlen($vendorLibrary) - 3),null,true);
+ substr($vendorLibrary, 0, -3),null,true);
}
} else {
throw new \Exception('Cannot read core/js/core.json');